commit | 29170e5f45ab1284ae2439c8c5102593fb217cc2 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Sep 03 06:20:17 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 03 06:20:17 2020 +0000 |
tree | 663453f92f06729f2f865238660bd9f7368dd159 | |
parent | 0d0dc9fa8b91472ac4ec2547d99335540877995d [diff] | |
parent | bc080eb25794dd4216b31bad35659493e8b05949 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: bc080eb257 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12516984 Change-Id: I657d697b159560ebd2a88b4fc0f3d9c22ebe8725