tree 2f545d89519078bf2c8022e1374dfa30bba96d2e
parent 3fc6731624433804f88ddb5985df76277a022c76
parent 733467e10b0055c07c3ead1aa30d4dda2a6ffda7
author Pawin Vongmasa <pawin@google.com> 1500592651 +0000
committer android-build-merger <android-build-merger@google.com> 1500592651 +0000

Merge "Merge "Add libstagefright_soft_flacdec to core_base.mk" into oc-dr1-dev am: 8fc04cc40a am: 5309a4758e" into oc-mr1-dev-plus-aosp
am: 733467e10b

Change-Id: I58f332ca5090a0f41ec96b0119f7af3ebc4cd821