| commit | f575c23bc3d3fd59384800f2f9f23cbf3f5acabd | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Mon Jun 21 17:22:56 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 21 17:22:56 2021 +0000 |
| tree | 125c8f04e2b129881d3ef4712bddbbd3e80aeb02 | |
| parent | e990c57cd8b1049c5134965ceef8751eac7e6a6e [diff] | |
| parent | 016ca257aef6f3347df7f53caba83eb2341534f2 [diff] |
[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: d0dd207322 -s ours am: 4ff6fc1ffb -s ours am: 86d9fd6ff2 -s ours am: 016ca257ae -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/colorpicker/+/1741653 Change-Id: Ifb42490b1c8e57d38843417d8aa04cb13399a80a