commit | ddd72e19a7257fc7e7fa13f90ca3f6ad80c3feb0 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Sat Sep 05 06:21:43 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 05 06:21:43 2020 +0000 |
tree | 9cd0cd8fdc27448c7bdf7e1572fe22a7391dcb55 | |
parent | 03785cc05f585a995d6af82c01c8a108e605a1aa [diff] | |
parent | 155a66309d84c8356560234d5391ec5b20b2584d [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 3d92ef019b -s ours am: 8b38238766 -s ours am: b5b507c6b4 -s ours am: 8cff88b559 -s ours am: 155a66309d -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/colorpicker/+/1420256 Change-Id: I07a45c2eb656c36684cb88e73cb27c0bf5d4ab9e