tree 1d4ddfe5f14ea26d311e1b30ec030ee2805bd855
parent e935be4c114b60e2867924000854f2c318286a59
parent 8fc04cc40a9511fe5d850d4cf453de1a6e956943
author Pawin Vongmasa <pawin@google.com> 1500592303 +0000
committer android-build-merger <android-build-merger@google.com> 1500592303 +0000

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

Change-Id: I083c28df9d9ba1b1ce656222bc3d4196cdc8ae2e