| commit | 30e7ed24cccc7b7dd66342e5f19d3ff1cc314cfa | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Apr 12 06:13:10 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Apr 12 06:13:10 2021 +0000 |
| tree | 6129db95cf21be7de686efe0a5e1c34341928d5a | |
| parent | a53b070759d5b5694c07fddaf9ba5357fe862602 [diff] | |
| parent | c97e512117a91014abac24e7553421316cb08620 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: c97e512117 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14158288 Change-Id: Ife1a37c4ca1749a6f2a81f5b2dc26d3d31b00b5a