commit | a464a642b351242f4e51e4f1ee4aa54562598e2d | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Wed Mar 03 22:29:18 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 03 22:29:18 2021 +0000 |
tree | 065c114f4be4024b42a3625be21a7e9e6b728cca | |
parent | c49194457f4840f47328ae882d11c27b078ef905 [diff] | |
parent | 02fe3b1af92ae5f46c3a53c32772d28299cffb96 [diff] |
[automerger skipped] Merge "Merge RQ2A.210305.007" am: 02fe3b1af9 -s ours am skip reason: Change-Id Ib881ff1602d3ad6f910d60a6d301ace7ae76c379 with SHA-1 c49194457f is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/colorpicker/+/1613631 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4c920423ec9f0b0e7079517dc782797bac824bca