| commit | 7ba575af195d9ee26c7e0539b7431749a7acd57b | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Wed Mar 03 23:37:12 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 03 23:37:12 2021 +0000 |
| tree | 065c114f4be4024b42a3625be21a7e9e6b728cca | |
| parent | 99b279aeb8bf9169bb01bd4ca4996f8c3f1b1872 [diff] | |
| parent | a464a642b351242f4e51e4f1ee4aa54562598e2d [diff] |
[automerger skipped] Merge "Merge RQ2A.210305.007" am: 02fe3b1af9 -s ours am: a464a642b3 -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: Ie79c7df80d0042f0984dc95d5cff75df37d56e79