| commit | 5029d122d0cbf7218b802bcbce272893367c2e7b | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 10 19:45:02 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 10 19:45:02 2021 +0000 |
| tree | 9d296871f99316e55da1b43fa698bd0dbcdff23a | |
| parent | 268afc97ccdb7b286e61259d5683dd8a8cfef1ae [diff] | |
| parent | f2b2ca9904628078aaa9284c7eab6cd442d69450 [diff] |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: b3f83980e0 -s ours" into sc-v2-dev-plus-aosp am: f2b2ca9904 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15509038 Change-Id: I4c16cf5f3d7f4f0784d207c9354aa4c77480ab37