tree d3d999474ebca69ef02bde7ff11d96153e7c0f21
parent 6d87dbfd47de60f8e14753fd54028da1cb5942ba
parent 8d4c382db4f89c30a309ffa16bef33930c691681
author Andy McFadden <fadden@android.com> 1362591825 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1362591825 +0000

am 0ab4d866: Merge "Correct MediaCodec + Surface behavior" into jb-mr2-dev

* commit '0ab4d86643dfb668a583c13b8bd61b589dbe8602':
  Correct MediaCodec + Surface behavior