tree b2a6d4894c7e7ff206b4cbb2806e7374730bab55
parent e09634e3b31cd2da2647047fca85d76067351f3e
parent b2657eecac53e26b9233060d1011c82836594da5
author Xin Li <delphij@google.com> 1633679833 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633679833 +0000

[automerger skipped] Merge Android 12 am: f9a845802f -s ours am: c0329df68d -s ours am: b2657eecac -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: I189dc0330b08f21f76427172a55ab7baacf793cf