| commit | f537f1061e0d418e8938738b1e5de9bd4e520a77 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Sep 12 13:55:16 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Sep 12 13:55:16 2021 +0000 |
| tree | bc163ba196ce38ad2b7503cfa740bb3f8db2fec7 | |
| parent | 970f84bf4938c70b81276d60f6195d0c09a67086 [diff] | |
| parent | c9f231d3d2ec68e5c8f867d47ea2658d3395c6a3 [diff] |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: c26cd981f0 -s ours am: 14bb10cc32 -s ours" into sc-qpr1-dev-plus-aosp am: b246906ddd -s ours am: c9f231d3d2 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15807557 Change-Id: I4aa3861515b33a700488d5f54a4a489676894ce4