commit | 227f489d8a0b1a935277547147849d11f64bfd16 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sun Sep 12 13:35:38 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Sep 12 13:35:38 2021 +0000 |
tree | 5feffc0eba63cac9df8f0b9f58a268a88e526bf0 | |
parent | fe6994b5281cc6e6e87a9f839a932b50371b9c98 [diff] | |
parent | d4864309dff1edefd662f9cddffbffda45a2c2eb [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 54296def63 -s ours am: c2c88393d7 -s ours am: d4864309df -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15806411 Change-Id: Ieade6d5a857066ddadd78f16f2e03945722d8da8