diff options
author | Bill Yi <byi@google.com> | 2021-09-04 05:55:22 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-04 05:55:22 +0000 |
commit | 4b8b76d862536afaf75e097caed12b5fef3d1618 (patch) | |
tree | 3bc7adbd8a6af3d62bfadaa60a672bb42ed3824d /sample/res | |
parent | 675268054bd9671e985945819f99ae1c84e7b9c8 (diff) | |
parent | ce5876c2aee17028e5d85ba764742a8b0d181ac0 (diff) | |
download | chips-4b8b76d862536afaf75e097caed12b5fef3d1618.tar.gz |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6f322ef71a -s ours am: 8427727df5 -s ours am: 87c27ac2f6 -s ours am: ce5876c2ae -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/15752202
Change-Id: Idadc9c54b2df94e099b4f68101ff28ee9a8cc8be
Diffstat (limited to 'sample/res')
0 files changed, 0 insertions, 0 deletions