commit | 96c87f225171beedb4f662a1df41194846cede5a | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Sep 19 07:00:55 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 07:00:55 2020 +0000 |
tree | 7bd1e419d3510c1b5ec9750bebd3cdc1d91faef7 | |
parent | 4401e2bf1f3a8743c59d98d9303aa55a829ae432 [diff] | |
parent | fa8bb3a205847eff4daab087b6f31f68469962b2 [diff] |
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 72d0760c97 am: 701935b74d -s ours am: fa8bb3a205 -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: I3c3ef374dbb0567a0e1eb1b311aac0218d4631ed