| commit | 86d9fd6ff2027cf86dc459dc98b398eb6369891e | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Mon Jun 21 06:42:47 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 21 06:42:47 2021 +0000 |
| tree | 125c8f04e2b129881d3ef4712bddbbd3e80aeb02 | |
| parent | f784b7b96043214634c333ff888501cb03a59747 [diff] | |
| parent | 4ff6fc1ffbd3017f87179a77ff91d82226b5de51 [diff] |
[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: d0dd207322 -s ours am: 4ff6fc1ffb -s ours am skip reason: Merged-In Ida6ead879f60ada231c35ca699f34b664934e79b with SHA-1 d16b245115 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/colorpicker/+/1741653 Change-Id: I25ff2e11320bde591a8943cc0671b846d87d79b3