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

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

Change-Id: I82886294ab069a3e0d4cd97f26885f60ff408169