| commit | c9f231d3d2ec68e5c8f867d47ea2658d3395c6a3 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Sep 12 13:36:15 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Sep 12 13:36:15 2021 +0000 |
| tree | 5feffc0eba63cac9df8f0b9f58a268a88e526bf0 | |
| parent | c1bd696ec2aacf27e543edd89ee830428860d497 [diff] | |
| parent | b246906ddde8f92a92a4cb604e9ed4cf30b64201 [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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15807557 Change-Id: Ic0ee9abf7ca6617c4ee2bc07c021928b956dba48