tree 7bd1e419d3510c1b5ec9750bebd3cdc1d91faef7
parent 2db465e47df34776eb5c7dd081dc79e2ad51e7bb
parent 701935b74de2679dfb282d563829acc2ea65f696
author Bill Yi <byi@google.com> 1600494632 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600494632 +0000

[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 72d0760c97 am: 701935b74d -s ours

am skip reason: Change-Id I21d69cc834760042b5e6f809ad91b9fd5b8fa711 with SHA-1 2db465e47d is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/colorpicker/+/1431516

Change-Id: I45ec67e2ca1ef1773fe5153b195af07f3f82b850