| commit | 2db465e47df34776eb5c7dd081dc79e2ad51e7bb | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Mon Sep 14 21:18:49 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 14 21:18:49 2020 +0000 |
| tree | 7bd1e419d3510c1b5ec9750bebd3cdc1d91faef7 | |
| parent | 63fdae7c73ec99422908c583d217c12d7f22b1ce [diff] | |
| parent | b77d7cdcdf09709ca1d2861f06d36c1f8168c16b [diff] |
[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: b77d7cdcdf -s ours am skip reason: Change-Id Ibbf4aadc0c9f85350a6b71e80b2abbbe3cb5f698 with SHA-1 63fdae7c73 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/colorpicker/+/12579464 Change-Id: I21d69cc834760042b5e6f809ad91b9fd5b8fa711