commit | 3f93090defbe6c94c4338a2a68270ef400cfe12a | [log] [tgz] |
---|---|---|
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 09 17:00:31 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 09 17:00:31 2021 +0000 |
tree | 21cd2a75024b46a463773d3d21686002cf806436 | |
parent | c0347c413782994996b134f581b8f2611b75d55d [diff] | |
parent | c0088d8e520f1048d9426a9993361af9e2e756f6 [diff] |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 63d036abaf -s ours am: 1b10fac772 -s ours am: 4916b75a24 -s ours am: 92b00d98f6 -s ours" into sc-v2-dev-plus-aosp am: c0088d8e52 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15748025 Change-Id: Icdf57487155f3914d87e68ae05ae281835f7bef0