tree 88bc0f88997048cc71668332e30ab5574e2ddce9
parent 255faebab9f18058e30541b22cc6879db14e7d2e
parent bc8e36dda2f0659f7d356ef27e4651e08f4a4727
author Xin Li <delphij@google.com> 1682118733 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1682118733 +0000

Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 am: 819ac6e8f9 am: 94e885f8d9 am: bc8e36dda2

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

Change-Id: I2f6d041d1da4cc99bb50b0a5fc1c7bc9b89ab8be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>