| commit | bc82a0592ab539631b18d494cdb14e7eb5a8ff74 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Sep 01 21:47:06 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 01 21:47:06 2020 +0000 |
| tree | 7bd1e419d3510c1b5ec9750bebd3cdc1d91faef7 | |
| parent | 61a70d514fb853fd4f2338a5627cd7a0b5badacc [diff] | |
| parent | 88a9dd9a977d8ee54eec034064feb93e7d0c156c [diff] |
[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 4c95a529d8 -s ours am: 88a9dd9a97 -s ours am skip reason: Change-Id I17f6da6780a021e7611ffde83841e15c9e282224 with SHA-1 05ac310337 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/colorpicker/+/12470171 Change-Id: I587f7051c10c8c469b500610c757ab30d85efedf