commit | 8b092063f21c2f6911f87cc780aa8e168957d796 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Sun Jul 04 04:57:31 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Jul 04 04:57:31 2021 +0000 |
tree | df3e2531dbc2062eab1729f982bdb9036443d365 | |
parent | 6d3f89acdd874802fa4eb2f1f28ea1b5df4325cf [diff] | |
parent | 62a573b73df0805c9c15c30b67490d6a7cf8d032 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 2c8d377332 -s ours am: 62a573b73d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15200128 Change-Id: I4499e8407a3a2834a41a54be3f20ac53e5be8ccc