tree d090e416c6fe557020024cde2afe434b5328d93b
parent 4a7850b96bbb5e4fa73c17af0ea4933ad499ba6e
parent 3ef8aea952e0949e57faf709b34bb0b15481a2c5
author Mariia Sandrikova <mariiasand@google.com> 1559326326 -0700
committer android-build-merger <android-build-merger@google.com> 1559326326 -0700

Merge external/lottie from aosp/upstream-master into aosp/master am: d5ae520ccb am: 95efd48bae
am: 3ef8aea952

Change-Id: I471bc8f93034a278220011927e22b8d636ff7876