commit | 8b3823876677da8926b5d9df947c928e18d0aa35 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Sat Sep 05 04:28:46 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 05 04:28:46 2020 +0000 |
tree | 9cd0cd8fdc27448c7bdf7e1572fe22a7391dcb55 | |
parent | fc3642363b9ccb4dbc9f841ac498cd9841c30d64 [diff] | |
parent | 3d92ef019ba2a68b0feae5ba85001249c2433c1e [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 3d92ef019b -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/colorpicker/+/1420256 Change-Id: If27e2a7a9a9183cbfcf9ef0f484c3c9ccc03cbc1