| commit | 6d4dab49d2ae2368c0b77574da29c24729e04f1f | [log] [tgz] |
|---|---|---|
| author | Xin Li <[email protected]> | Sat Sep 07 02:38:29 2024 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Sat Sep 07 02:38:29 2024 +0000 |
| tree | 2a57856ff428f231e5b11293323334d6068b5c33 | |
| parent | e26cd8413726e49a13cfd69930e2e08e5f67a0a4 [diff] | |
| parent | 5ab4be81730059552f2a8e7f5c3a673211946e7d [diff] |
[automerger skipped] Merge 24Q3 to AOSP main am: 5ab4be8173 -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: I9d9d8ebf1c46a806a10dee8810a8195615bd79f6 Signed-off-by: Automerger Merge Worker <[email protected]>