tree 124c45c400eb50b85245dffbfe7768478cbf7287
parent 073461e046a920e24a4ea723b7eab21678b8813c
parent c194d5341150498093f1b692690f07255e89cbae
author Pawin Vongmasa <pawin@google.com> 1500592444 +0000
committer android-build-merger <android-build-merger@google.com> 1500592444 +0000

Merge "Add libstagefright_soft_flacdec to core_base.mk" into oc-dr1-dev am: 8fc04cc40a
am: c194d53411

Change-Id: I2e4c216726d3bcf6a732165e71c7c00bfa688ed3