commit | e5c7f2c24d9429e49b020e5d597a84885941eae5 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri May 07 23:44:48 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri May 07 23:44:48 2021 +0000 |
tree | 75ec337bccd685ba448c39088dc9eaa7eb3fffab | |
parent | 77adbea4e453bf6413a350584a2aaeb6eb9c7ac3 [diff] | |
parent | 9145d1b50382fd510c228b12949fc6b1ffb43901 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 9145d1b503 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14469073 Change-Id: I80ee91089980968f1e7f97d15d403c9d582460ad