tree 125c8f04e2b129881d3ef4712bddbbd3e80aeb02
parent 3f5b698288ee1309c652f2ed00fae737fbbd6f66
parent e0e4d25b594aeb0d6e30538dff58a437a7470e89
author Treehugger Robot <treehugger-gerrit@google.com> 1625417942 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1625417942 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e0e4d25b59 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ic738f2a9bf8865fb739c1b8bf61e323e1aee2a5b