tree b2a6d4894c7e7ff206b4cbb2806e7374730bab55
parent 06b68f7ab6f8321bebdb63ef77c0852545f8a9c3
parent c47e710d824f81f7d24468ffa0bf038683601c62
author Xin Li <delphij@google.com> 1633683622 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633683622 +0000

[automerger skipped] Merge Android 12 am: f9a845802f -s ours am: c0329df68d -s ours am: b2657eecac -s ours am: 0089f8352c -s ours am: c47e710d82 -s ours

am skip reason: Merged-In Ic6c53901be1d94b9f92dd95c481ca9d360a302a3 with SHA-1 0be80335f7 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/lottie/+/1847430

Change-Id: I5b7084e3b10e90a3890d1e8868be20fa5dd827c3