| commit | e6cb412b677966c25b424766dc6ceb2787d49caa | [log] [tgz] |
|---|---|---|
| author | Jamie Gennis <jgennis@google.com> | Fri Jun 22 15:20:48 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 22 15:20:48 2012 -0700 |
| tree | 6bfbcf0b8cdfa231f5638b2e9eca58c271e48123 | |
| parent | 5ca15ccf7336d5aa5a7b563742757fa37092eb48 [diff] | |
| parent | 33e28dd3c033641f4db9d1b99c7c88d6d08c61f7 [diff] |
am 33e28dd3: Merge "SurfaceMediaSource: keep refs to current buffers" into jb-dev * commit '33e28dd3c033641f4db9d1b99c7c88d6d08c61f7': SurfaceMediaSource: keep refs to current buffers