tree c9150aae583ee04a6120fd37f9784eb3abd78157
parent 7a337b8f4c49588e350ec47f214c35fadaa9af29
parent 2f368e57e58c6bc3ab291d6318b19c6698fc184b
author Chong Zhang <chz@google.com> 1414010861 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414010861 +0000

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

* commit '2f368e57e58c6bc3ab291d6318b19c6698fc184b':