commit | 3abb35122161c539a63d42a129afbb490652ab86 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Oct 05 13:37:05 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Oct 05 13:37:05 2020 +0000 |
tree | cdb13b34715739f6a19ac410a2a3abe1ba9d8657 | |
parent | e13d2abfb93de0646d8b3a77aea5914fdfb864ab [diff] | |
parent | 9aee32dba953c08e63b79017daac5d007570220c [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 7e335c887e -s ours am: 9aee32dba9 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12759559 Change-Id: I46c4ab7ad5519a51a670d6ae96a488e0bc5e3cfb