commit | 590e61910d4941dbc0a1c0cb51596fd791e48053 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Dec 13 18:30:27 2024 -0800 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Dec 13 18:30:27 2024 -0800 |
tree | 0ac86de17e8225ec2d89ced65c6a0344bc0a43c0 | |
parent | f4b6947e390897c4147dfb1e0bdc07ed04726590 [diff] | |
parent | a446d90800bf8986986acc390de53f7c9bfdaabd [diff] |
[automerger skipped] Merge "Merge 24Q4 into AOSP main" into main am: a446d90800 -s ours am skip reason: Merged-In I221a9c64159e6b0456a3c9ffeead7422e4e1ce38 with SHA-1 4bdef2719e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/skia/+/29679134 Change-Id: Iccd4460b0c5d58361813de5be1f8cb4cddba0539 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>