| commit | 0c426e17940523cf2c8cc057d93b0863b2193071 | [log] [tgz] |
|---|---|---|
| author | Xin Li <[email protected]> | Sat Sep 07 04:22:37 2024 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Sat Sep 07 04:22:37 2024 +0000 |
| tree | 2a57856ff428f231e5b11293323334d6068b5c33 | |
| parent | d32cccc13cc1f73c5707545f76e0a2ef1e4df4bc [diff] | |
| parent | 6d4dab49d2ae2368c0b77574da29c24729e04f1f [diff] |
[automerger skipped] Merge 24Q3 to AOSP main am: 5ab4be8173 -s ours am: 6d4dab49d2 -s ours am skip reason: Merged-In I6c4c15d19465ceb009c62e02e12f457ab0fde249 with SHA-1 e26cd84137 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/colorpicker/+/3257173 Change-Id: I2e3c2e94c405386ca5e391cd5e5f17c874d173fd Signed-off-by: Automerger Merge Worker <[email protected]>