tree 1b7a6ca5e4a2914fed0d917912cbf7e78e12d3bb
parent 671352ec64f21257aefcb06a18d7cac993d8d2b5
parent 1fa5303a028ad4c39c91323abe4f411f11ab1e3a
author Xin Li <delphij@google.com> 1725676502 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1725676502 +0000

[automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: 1fa5303a02 -s ours

am skip reason: Merged-In Icec0b50f6421770e15c40b0676b49b95b035c230 with SHA-1 06880a0d97 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/libpng/+/3258537

Change-Id: I872bc3a6a6e91b499a96b6a778808d49d6ca9435
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>