commit | 0d7dda110f14a053d9b65200662c6b65a3f769d2 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Apr 22 19:38:42 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 22 19:38:42 2021 +0000 |
tree | 87611a13927dbbd03ed3a6efe9f44700c433b172 | |
parent | 2426528e62337da337ccdc18c90b50daa125a8f0 [diff] | |
parent | abed9825c42ffa9bf77f1a7266dbe3a7b5e12571 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 1cb2c100e5 -s ours am: abed9825c4 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684926 Change-Id: I7e223e27fed7eb8247b351faaf049c2e81d7fbde