commit | 523d30f631e1fc7be4692dad9e07d96ea8bcaf3c | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Oct 05 14:54:17 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 05 14:54:17 2020 +0000 |
tree | 0c029ad1b5822ba58f41827a57520a1029023981 | |
parent | 126049588f4f43ae39d996de269a3bc6b089cff4 [diff] | |
parent | a3d1d70981eae6c01f11dba09bac74f08d8cefba [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: a3d1d70981 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12762769 Change-Id: I847f6e8fa0c4533058b13463c3a9294b3e704bb1