tree 9cd0cd8fdc27448c7bdf7e1572fe22a7391dcb55
parent 05fc059ba7d7e4a65a361cdfd7b8e9ea87099e48
parent 5b52af270e3ac9adc12e86ea3765cf984557dbeb
author Bill Yi <byi@google.com> 1594085824 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594085824 +0000

[automerger skipped] Import translations. DO NOT MERGE am: a352ec9151 -s ours am: 5b52af270e -s ours

am skip reason: subject contains skip directive

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

Change-Id: Icf2cc6550d686b32e782597a17cc888a3450edf5