commit | d16b24511572604cf0b4a59e977a723a12b1d1f1 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Thu Apr 22 23:40:08 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 22 23:40:08 2021 +0000 |
tree | 065c114f4be4024b42a3625be21a7e9e6b728cca | |
parent | a464a642b351242f4e51e4f1ee4aa54562598e2d [diff] | |
parent | 06c04811ab47b34db6083a338c44dc4761c1e5aa [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 06c04811ab -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/colorpicker/+/1685007 Change-Id: Ida6ead879f60ada231c35ca699f34b664934e79b