commit | 67b096924e061868bb92af65adc4bf40572c7413 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Sun Jul 04 18:26:43 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Jul 04 18:26:43 2021 +0000 |
tree | 125c8f04e2b129881d3ef4712bddbbd3e80aeb02 | |
parent | e1ea16857caa90c6ab0176ab1f7f5cb0a6c0b853 [diff] | |
parent | 65d90cd6850a7cbe3f27fcb3996b666078a40152 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e0e4d25b59 -s ours am: a65a6f718d -s ours am: f2508401a4 -s ours am: 65d90cd685 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/colorpicker/+/1755751 Change-Id: I4a37681d89b9bbebfe4dd621cf63c1cd76fc6202