| commit | f2508401a4f05e57e180c14849575c9fdc2ea1f6 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Sun Jul 04 17:27:15 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Jul 04 17:27:15 2021 +0000 |
| tree | 125c8f04e2b129881d3ef4712bddbbd3e80aeb02 | |
| parent | 4d8a3c76bb526ef55d53d34a929f7757166e298f [diff] | |
| parent | a65a6f718d9bfcaf53160385673e2e2a13e878d4 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e0e4d25b59 -s ours am: a65a6f718d -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/colorpicker/+/1755751 Change-Id: I2b80c8d2f162c2789b684dff817cfe70f313d281