tree d090e416c6fe557020024cde2afe434b5328d93b
parent 4a7850b96bbb5e4fa73c17af0ea4933ad499ba6e
parent b9abfd37982682825487ff442fac6fdbf52e0b28
author Mariia Sandrikova <mariiasand@google.com> 1559236596 +0100
committer Mariia Sandrikova <mariiasand@google.com> 1559239378 +0100

Merge external/lottie from aosp/upstream-master into aosp/master

Third-party review: ag/6281574

Test: manually verified that build isn't broken

Change-Id: I837881bdf3f9e8971a00aee0b1dcf81bb88a6f3b