| commit | 7dede397e6ee850337f5da4f672c1fd18026c219 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Aug 29 21:01:56 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Aug 29 21:01:56 2021 +0000 |
| tree | 994c159e344da7f899906d85527dac7b647a4de6 | |
| parent | 55e14fccbbd51cf3d042e448ebc259fc15ebdea8 [diff] | |
| parent | 501c3dec9b73a157686faf35bec90b3ec1e57c3b [diff] |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3280b6a035 -s ours am: c6b0a35410 -s ours" into sc-qpr1-dev-plus-aosp am: 501c3dec9b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15693353 Change-Id: I69b34917236db530c821da26ee574bcfec965cc2