commit | dec7d79809e0315d53ad4e0a843a67a19c8fdc77 | [log] [tgz] |
---|---|---|
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 03 16:40:51 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 03 16:40:51 2020 +0000 |
tree | 0654f5b9fdcb684df9d17c0ba6ece739517d0c96 | |
parent | b03fe7380989695d1010372386f1e4132c1873e7 [diff] | |
parent | 80f5ac3388e5ae73ff19597fdd64f8bb05248974 [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: 80f5ac3388 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12515250 Change-Id: I6e10d2f36c707ef0438e673a027d9a38768097d2