commit | 8d66fbb8f9cbebbaefd349612dea380e28240d82 | [log] [tgz] |
---|---|---|
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Aug 28 09:06:59 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Aug 28 09:06:59 2021 +0000 |
tree | 93087071a7c72b35f080f14399ae1416f3cd56d5 | |
parent | 1baca6c8dd2356f365769513db2ea5f2f5b4011a [diff] | |
parent | 7b575658ffd9d0cd5bb0ae9f3dbbc39ad0b9f840 [diff] |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 8e36e46a45 -s ours am: 8c21e4804f -s ours am: 8fea045c00 -s ours" into sc-qpr1-dev-plus-aosp am: 7b575658ff -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15695548 Change-Id: I8ba94589698863faee581bc9b89db0a52ae01ed7