tree ce8e2fd13dfec98c22e14f5f2d2d93eaef1a2e6f
parent 27683cd0425fcbb822f2072f62baec092246594a
parent 02ecfe8b5941b055268e89a99b66874737324a6a
author Treehugger Robot <treehugger-gerrit@google.com> 1599379443 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599379443 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 839c760b81 -s ours am: e3aab927b4 -s ours am: 25e9210120 -s ours am: 02ecfe8b59 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I2f528870323c84f70873e0a166edaf6d97c4d38f