commit | fa1d89580f2224d88f8177ff8e96ad3a1fad75cc | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Jul 12 18:05:43 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jul 12 18:05:43 2021 +0000 |
tree | 6dd522bcc76ce32f26a57bc791650e9ae5ce75b3 | |
parent | 26ab789b77183413e9d7d391f84cc480fc02dafd [diff] | |
parent | b524d9932f5e3573d141ae0d3bea11ba22026a93 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 23061f1b50 -s ours am: b524d9932f -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15260115 Change-Id: Ieb3194e13b206af531ae9fd77e6c76efeaf08592