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