| commit | 5d655610850ae32b73c52c1a6765aea86f56777f | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Nov 02 00:47:09 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Nov 02 00:47:09 2021 +0000 |
| tree | c2748df09a005d6b1e4e8c307582ae44b1a0395a | |
| parent | 4081a98aa67673de685ddf4e194702ec92cbc5c2 [diff] | |
| parent | a61316757d1e9c7a43b85dc8abda1c9fc98dec54 [diff] |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c99378b0f1 -s ours am: 8439fe32aa -s ours" into sc-qpr1-dev-plus-aosp am: a61316757d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16155555 Change-Id: I7b82f7f8793b074ce8ef0bc75becec8e1b4ed0ea