| commit | edfdc8b716c7729e5d2fbf189f03e46f69c6fe53 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 03 15:42:11 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 03 15:42:11 2020 +0000 |
| tree | c6c8cac41b1333df1316e1c39cb9dd311e5cddf4 | |
| parent | 001d184b536e3ad6b48c9e9270337c82fe548cf0 [diff] | |
| parent | ba9c2ecfd57befb2a9c937eff2fc66d9c05f692c [diff] |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 94fbf790d7 -s ours" into rvc-dev-plus-aosp am: ba9c2ecfd5 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12515250 Change-Id: Ia9bf530f1374ad90b35b2987eafa37b05bb27158