commit | 6d5cc3989be7a7b9a873e21d212d32c4ee5a31fb | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Mon Mar 01 16:04:13 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Mar 01 16:04:13 2021 +0000 |
tree | 66ef674a20119f48acb7856002a3ecc76561d0df | |
parent | 6cdb4f4ff574ecee9497ef6fbcb2f6d35c07da72 [diff] | |
parent | 41e859a9775f600932dd3c1a3aa35f8ae3e2328b [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 41e859a977 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13723060 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie3464fa758b8d45d6ec53da94a9602ad0ddfad9f