| commit | 1c9833d44c1dceddec87e8a5279efe0f89c1e8f7 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Aug 15 04:56:43 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Aug 15 04:56:43 2021 +0000 |
| tree | 488df6b1349787a0c56344e93c00b3c312c581c0 | |
| parent | 755267d82acc8f1eda178ca71ab3011d784c412d [diff] | |
| parent | 56568cb0639499834a4fe5a2cec472a9d9c0e7cd [diff] |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: da46d42b87 -s ours am: e4c51ab8fd -s ours" into sc-qpr1-dev-plus-aosp am: e83409a8b0 -s ours am: 56568cb063 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15544444 Change-Id: Ia375f68e855cb435d2621adca77f9a3b2b5e1479