commit | 67af3317ff30b0ebdd55d77fdc3bb538c9bc4f55 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Sun Apr 18 04:04:46 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Apr 18 04:04:46 2021 +0000 |
tree | 540d5b936cc5462144840e9a7ab9cdcd3e26387b | |
parent | 15f0e3c2e9d4ed478e3c25628c7c9f5556d5fd6e [diff] | |
parent | 286e3eb3291bbbe862220be1a35a223bb96d56e9 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 286e3eb329 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14226671 Change-Id: I8cdc84a2599626038d37c81183c4243ef67b60fb