commit | 324645af2912d05642198a112261f69b0163915f | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Sep 03 10:21:14 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 03 10:21:14 2020 +0000 |
tree | 663453f92f06729f2f865238660bd9f7368dd159 | |
parent | a6df809312e12eb7f72395af376f582a295c6599 [diff] | |
parent | f8553f99acade8dd007609fdbd5a39f5739877a4 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: f8553f99ac -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12514865 Change-Id: I66caf88626132ec649f1c2afa5793cfc74943bfa