tree 8025c6c5bd887693c793b3b3cc5b692c53c85d99
parent 156c5f3fe0d4d89efe80896c590561eb243fb5b0
parent 9e43a105776d108a9a6ab98eea3e805ceb29e593
author Marco Nelissen <marcone@google.com> 1474318401 +0000
committer android-build-merger <android-build-merger@google.com> 1474318401 +0000

Merge "stagefright: fix finding hardware codec"
am: 9e43a10577

Change-Id: I8dfbdef411cf778d658b83495d3570c1c32e607b