commit | 3c8b6469510d1c5c7342f9c1c19cb163a5e1f4a1 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Oct 08 07:56:25 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 07:56:25 2021 +0000 |
tree | 41c5c515245675cde35f389644b9753c5b2fc068 | |
parent | dd5936d96545dc0b4b020855e71db8e8fc34a769 [diff] | |
parent | 12390332a6df687dbd35fce3c332195ff10a3e96 [diff] |
[automerger skipped] Merge "Merge Android 12" am: 87023ffacd -s ours am: 6e55a29446 -s ours am: 12390332a6 -s ours am skip reason: Merged-In I4b71631793d360a50ede5619f3b61dd2cece1ccc with SHA-1 0dd1133823 is already in history Original change: https://android-review.googlesource.com/c/platform/external/webp/+/1847597 Change-Id: Ie1680e5ce25a5a9815067f4e1b748285f05d3dfb