commit | 3ca99603e3651d32e41a5d5cb06ff61283a0ca70 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Apr 22 21:23:36 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 22 21:23:36 2021 +0000 |
tree | 87611a13927dbbd03ed3a6efe9f44700c433b172 | |
parent | 7a9d7c3b12b1f389bd5095d51205f08e6d68ce8d [diff] | |
parent | 655c3483dd14c2ec42906d3e45cefd445126da3d [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 07587bd2f7 -s ours am: 655c3483dd -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684930 Change-Id: I63aad3dfab7083c8a084e244ce2ce2a17546b4fe