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