| commit | 6e5f5e62a49f76a4cb19179671477bf2921dbcd3 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Sep 03 04:55:46 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 03 04:55:46 2020 +0000 |
| tree | c0b93d439cb39b9eb973b3144b23658ed8f96137 | |
| parent | 36d95d41470f25be90660a8bf7dc9c6bc69eec8f [diff] | |
| parent | fbeb0ef04f5fb3c26525260d8e7441e02bce6cab [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 552fe692a6 -s ours am: fbeb0ef04f -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12513765 Change-Id: Ie1038aed951144989d9054177706ed5566913637