commit | 0d7fa3c08fe09a89f6fc742f80ca92c68b51e584 | [log] [tgz] |
---|---|---|
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jul 21 20:07:59 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jul 21 20:07:59 2020 +0000 |
tree | e09d00a91d642651c1d579625121cbd76dbf515c | |
parent | 561722247abdc146e83c3c31d63e28860924a8a9 [diff] | |
parent | 87cfefce3ed88d29fa7aeae01fe7ade2bc0b9f0e [diff] |
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2414b21d4e -s ours am: 5bef533f30 -s ours" into rvc-d1-dev-plus-aosp am: 87cfefce3e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12198205 Change-Id: Ie40e959d3b4aa5aee543ed2b8761fffa00083237