tree 124c45c400eb50b85245dffbfe7768478cbf7287
parent b845ba54650b905b98dc1aa058c3965b8ea8578c
parent 4c6f4518e89191d0a2769615f454531baa453b4e
author Android Build Merger (Role) <android-build-merger@google.com> 1500592457 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1500592457 +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