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

Merge branch 'lmp-sprout-dev' of...

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

There are no changes