| commit | 61ca353bc2c07ef75097949195da933bc844a8fa | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Jul 29 15:53:42 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 29 15:53:42 2021 +0000 |
| tree | 54db1627af54699a4f04319518b01c8b79a74f6b | |
| parent | 5b9569da83bed31d803e8544885357d5d3e85d1d [diff] | |
| parent | a92b2e2e53265ba6fe8c24e9c3e4869333733c3e [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 45c7e3679f -s ours am: a92b2e2e53 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15405283 Change-Id: I24ef0ea1b0fd410dc553c4911f2c930c0ba0e722