tree f6b0d536de41567175259a5a7d98e43144cd99bb
parent 39a3113539f9bcc86a8efe562780c23ac8731098
parent 2cd25a9056cc150b9fd3ac9b0bca37a1334ffd47
author Jamie Gennis <jgennis@google.com> 1340403506 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1340403506 -0700

Merge "SurfaceMediaSource: keep refs to current buffers" into jb-dev