commit | f6374c6bec14a92d47ba32f0a00966c8532b0fb1 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Apr 22 20:29:45 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 22 20:29:45 2021 +0000 |
tree | 46722e29358f6eb0eb8b41b870086e52cc440409 | |
parent | 975541d9f0ea22fb55d175254bff67eef70d5cdc [diff] | |
parent | 679c6571220769b0e47baeba1a4cfcae87f23383 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 679c657122 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684653 Change-Id: I2ce940a7276b2ed8469a54786891005d601607e2