Commit 2fd47f8c authored Nov 21, 2014 by Chong Zhang Committed by Android Git Automerger Nov 21, 2014

Merge branch 'lmp-mr1-dev-plus-aosp' of...

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

There are no changes