| commit | 80f5ac3388e5ae73ff19597fdd64f8bb05248974 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 03 16:12:12 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 03 16:12:12 2020 +0000 |
| tree | 90d8061def99099e464e6d125efd08f3bc13f246 | |
| parent | 69227f0bfada8ed2920cb4796b86c5e1e1afe83e [diff] | |
| parent | e1ac7346f1806c3fbbd0a93a2d65037f11e73a89 [diff] |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 14d438a337 -s ours" into rvc-dev-plus-aosp am: e4d619fc77 -s ours am: e1ac7346f1 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12515250 Change-Id: If335fb0237a1c82b821040f3c9c876701fb14594