commit | c74a68a5e50ff5662385bde7c27f933884e5a8d9 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Aug 10 20:19:17 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 10 20:19:17 2021 +0000 |
tree | 6da1311abc5b9539ea69a07be5cb98d02d4b7a25 | |
parent | a920a2ea1c7fc7eb5674f85c32cd1ee6c716d944 [diff] | |
parent | 2e95d0be8c1d2679ad5e3f5ceeacc2bfa806a7a2 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 40cb9ed9c1 -s ours am: 2e95d0be8c -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15515959 Change-Id: I90f49e3d8050c4280ca0a627a27e0017c80bfb02