| commit | c2c5019256824e8a192c364d52a2abee4334d9af | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Mar 04 00:12:12 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 04 00:12:12 2021 +0000 |
| tree | 125c8f04e2b129881d3ef4712bddbbd3e80aeb02 | |
| parent | 577048837fdff62c00230863e4950249c53014bd [diff] | |
| parent | 7ba575af195d9ee26c7e0539b7431749a7acd57b [diff] |
[automerger skipped] Merge "Merge RQ2A.210305.007" am: 02fe3b1af9 -s ours am: a464a642b3 -s ours am: 7ba575af19 -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: I7fd241c7912364a6eff0c8fc04c3db8323f662ea