| commit | 4bd7cfefeb90e29692db86e9bdcfbffeb1c78c44 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Mon Sep 14 22:20:13 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 14 22:20:13 2020 +0000 |
| tree | 7bd1e419d3510c1b5ec9750bebd3cdc1d91faef7 | |
| parent | 8eb03c34b38aed7242d71801077ffe36a7d9594a [diff] | |
| parent | 4401e2bf1f3a8743c59d98d9303aa55a829ae432 [diff] |
[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: b77d7cdcdf -s ours am: 2db465e47d -s ours am: 4401e2bf1f -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: I2d3eee67f8b029ba0139d315c05d72040b3d07fc