tree be506d001988d01f44f5a80aa9a3dec080d5cd77
parent 684ba0740389ab112e5e2fb0b78f54fbdd27f8a6
parent 4ec16aec45e28358504ba037174e89828514e4a3
author James Zern <jzern@google.com> 1649820528 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1649820528 +0000

Merge "update to 1.2.2 branch (20ef03e)" am: 223ae75fed am: fd8418a39d am: 4ec16aec45

Original change: https://android-review.googlesource.com/c/platform/external/webp/+/2060423

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