tree 68bac50e1cc51ea2ddf731f79e74077a77fd1e3a
parent b808408f697ac78a354179834f276862def11cef
parent 424a4be6b1fbe56b66039e7b093d318d52b68335
author Steven Moreland <smoreland@google.com> 1498499960 +0000
committer android-build-merger <android-build-merger@google.com> 1498499960 +0000

Merge "Use vendor variant of libstagefright_foundation." into oc-dr1-dev
am: 424a4be6b1

Change-Id: Iea3484f0926f9792744e552b39976992111260ab