Commit b9b21bc1 authored Oct 22, 2014 by Chong Zhang Committed by Android Git Automerger Oct 22, 2014

am 2f368e57: Merge branch \'lmp-sprout-dev\' of...

am 2f368e57: Merge branch \'lmp-sprout-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/av into lmp-sprout-dev

* commit '2f368e57':

parents 7a337b8f 2f368e57

There are no changes