commit | 6ccf19234324c5851ff7f973adaef8339ecc8ac0 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Mon Sep 13 05:39:57 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 13 05:39:57 2021 +0000 |
tree | 4fbed3943cd9347ad9061950704b7d5d90545f50 | |
parent | 6ab6522701edb4b31d0dd04594bf0c1f23b74731 [diff] | |
parent | cc2ec49eff7b3772d8728c9c1e45b93ca26560f8 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 906b2ed5a1 -s ours am: c8d003a518 -s ours am: cc2ec49eff -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15810226 Change-Id: Icfde75bf980c6aec6a89ef8bcffce3d15dbabd10