| commit | c0cdcbfefb08eeea2d2b689888f72043e95508bb | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Sun Jul 04 17:49:25 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Jul 04 17:49:25 2021 +0000 |
| tree | df3e2531dbc2062eab1729f982bdb9036443d365 | |
| parent | 44246788e5c5c91722c3a8eabbbddee58468c824 [diff] | |
| parent | 07c54d9bbb0fb531c729c7c53ad30992524362ae [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 3c26c8538c -s ours am: d6a6e05b27 -s ours am: 07c54d9bbb -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1755757 Change-Id: Ia5750d1f711411b24aa0b331e9a9ce02e1f9a03b