commit | d4669e7b1c915040c872edf6333c4402c65e3ace | [log] [tgz] |
---|---|---|
author | Xin Li <[email protected]> | Tue Jun 18 05:55:46 2024 +0000 |
committer | Automerger Merge Worker <[email protected]> | Tue Jun 18 05:55:46 2024 +0000 |
tree | 1b7a6ca5e4a2914fed0d917912cbf7e78e12d3bb | |
parent | 8843149c59268ba09fae1f5b671abe2b66b1a0d1 [diff] | |
parent | a3aa76becdbbfe6c519b00a85483e6d1956b9f00 [diff] |
[automerger skipped] Merge Android 14 QPR3 to AOSP main am: 52d2149426 -s ours am: a3aa76becd -s ours am skip reason: Merged-In I97fd4f2ffdfa2e5094b04e975ef4ce0ae9974dc2 with SHA-1 7c3a90dc60 is already in history Original change: https://android-review.googlesource.com/c/platform/external/libpng/+/3132316 Change-Id: I72e8271d5b6cd56556ee09439f1c15af57a36d3c Signed-off-by: Automerger Merge Worker <[email protected]>