commit | dd727c298ea460b85f0a2609d4b11786febfa5f3 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Sun Jul 04 04:57:48 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Jul 04 04:57:48 2021 +0000 |
tree | df3e2531dbc2062eab1729f982bdb9036443d365 | |
parent | b9aee121cf163b0f32d1432385c4f1581f8f8bf5 [diff] | |
parent | 0c91d61562ebee7cb77f2ebb6a03c59e03ca86b8 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 0d4acb77f2 -s ours am: 0c91d61562 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15200119 Change-Id: I86d76cf789723776913003434cbbd59f0c4a5b64