| commit | 9fe668c0a932f08d7fdf3f7cca6cf9bda0033cfe | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Aug 15 04:36:21 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Aug 15 04:36:21 2021 +0000 |
| tree | bd142d4237fee796ab3fc2aa73202e4fe18b7a7c | |
| parent | 56568cb0639499834a4fe5a2cec472a9d9c0e7cd [diff] | |
| parent | 797489f58dba5f61268cdcd0bf7e04812456a968 [diff] |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 87a0d9ef7e -s ours am: 2e0c1a0555 -s ours am: a4712801b4 -s ours" into sc-qpr1-dev-plus-aosp am: 797489f58d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15543339 Change-Id: Ic232daba21174fc8d3bc984c8f94d5f67cbe8cef