commit | 99b279aeb8bf9169bb01bd4ca4996f8c3f1b1872 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Tue Feb 23 09:05:16 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Feb 23 09:05:16 2021 +0000 |
tree | 065c114f4be4024b42a3625be21a7e9e6b728cca | |
parent | 8a6a454b948d6b7c8f76dd40f0f428d63b913c16 [diff] | |
parent | c49194457f4840f47328ae882d11c27b078ef905 [diff] |
[automerger skipped] Merge ab/7061308 into stage. am: c49194457f -s ours am skip reason: Change-Id I05e5688c89a206b9725d049f9395fdd773917514 with SHA-1 1a85f84502 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/colorpicker/+/13658368 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6e563bad4995506c63f5f6bcdb2df73a6b82ac29