commit | a355e12460a55819e6f733f6e44020696415a573 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Jan 11 01:20:50 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 11 01:20:50 2022 +0000 |
tree | a82ebf11200fa48b0a54a06180fb8610a62a7a0c | |
parent | 7347802ff1e874c2e82e0d6cc9e05a7028a6160a [diff] | |
parent | db4fc2c97266356c6790e08502479e2042fc8a5c [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 36682c2926 -s ours am: db4fc2c972 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/16598268 Change-Id: Ia34a441a125fb42ee5cb3e847b54e8b93c41b90d