| commit | 26a564a946f580dd69a33526a43d26ded068271a | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Mon Sep 21 08:41:22 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 21 08:41:22 2020 +0000 |
| tree | 7bd1e419d3510c1b5ec9750bebd3cdc1d91faef7 | |
| parent | 7de839cf32edea1644492e36e102cc258f8c8aa1 [diff] | |
| parent | 73a7af5e3c1b49203c42312c26eb4fb78140d3bf [diff] |
[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 0e0069fae4 am: 003644c698 -s ours am: 213fba0b1d -s ours am: 5c24099623 -s ours am: bff80554ad -s ours am: 73a7af5e3c -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: Iae715d83874f63ae2f2f1836ea41c88bbacf6c76