tree 9d47a2375a793e8003b9353a0a55b3b462603df3
parent 723fcc49e0ca7e18c6c3a6898a89c911f609e025
parent e6cb412b677966c25b424766dc6ceb2787d49caa
author Jamie Gennis <jgennis@google.com> 1340403830 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340403830 -0700

am e6cb412b: am 33e28dd3: Merge "SurfaceMediaSource: keep refs to current buffers" into jb-dev

* commit 'e6cb412b677966c25b424766dc6ceb2787d49caa':
  SurfaceMediaSource: keep refs to current buffers