| commit | 95585b047885afab561c6f4cf03d114b602f28b7 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Sep 12 13:54:21 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Sep 12 13:54:21 2021 +0000 |
| tree | bc163ba196ce38ad2b7503cfa740bb3f8db2fec7 | |
| parent | 58462428e96a41777216a501c0f5397bf21a490d [diff] | |
| parent | 2667b8245f04abef679cdf0412dcc20808eaf326 [diff] |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: aaf9602410 -s ours am: e0b10728ba -s ours" into sc-qpr1-dev-plus-aosp am: 12fc301db0 -s ours am: 2667b8245f -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15810223 Change-Id: I11bbcbf717e0639935f980dbe63914f8310891ee