| commit | 8808ec0b27b8c9d0e14c4594277e638171a11607 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Aug 29 21:01:32 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Aug 29 21:01:32 2021 +0000 |
| tree | 994c159e344da7f899906d85527dac7b647a4de6 | |
| parent | 22e2222a2eb8b1c8af840385861705ef3fe35e24 [diff] | |
| parent | 74ae65bca0995d0d4973217755de8f194abac94d [diff] |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3280b6a035 -s ours am: 82ec48afd2 -s ours" into sc-qpr1-dev-plus-aosp am: 74ae65bca0 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15693353 Change-Id: Ie4a9ea5627d2d695dc1301cf424476e2382ac741