tree a8d74edf36a60f437463878c5f34c13202995506
parent 76f35ab7ddd28570e7eb9ad08b20eca44e166e75
parent 086ccfd4ac8b813cbab3cbe78b14a60dc082aac8
author Marco Nelissen <marcone@google.com> 1571335558 -0700
committer android-build-merger <android-build-merger@google.com> 1571335558 -0700

Merge "libstagefright doesn't need libFLAC" am: a870fb0afa am: 625149dd57
am: 086ccfd4ac

Change-Id: I1a247359c11c0738a15a35a755ed122eb208b73f