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