tree a82ebf11200fa48b0a54a06180fb8610a62a7a0c
parent a5c00a8136585f64026d7f78aea9a7d2f60c97b1
parent 5f92a098ebc46446e8129ff3db45c063cbb6e431
author TreeHugger Robot <treehugger-gerrit@google.com> 1634882847 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1634882847 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 789d44cb33 -s ours am: 5f92a098eb -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/chips/+/16105714

Change-Id: Ida057ec46055c2259ca5176387ac60c64fe92165