commit | 3267a02aa784321ca7316c3c8109255e5309add6 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Jun 18 05:20:40 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 18 05:20:40 2021 +0000 |
tree | 4c8a2bbb717d73404e5126bd5d6c678bcf3d2996 | |
parent | 00960bb167803f33c53605bfa4366f80ddedf8e0 [diff] | |
parent | 21e9e54882a30f4a1410d396810bb7dc9b9fc31c [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 21e9e54882 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15021819 Change-Id: Ibac8c4f44f1d751bbf5431b28cb4889deee329e7