tree 170495ea90f215584e1cc52385b4fcf5620d032e
parent 4cd34752cb229f3e1716e1e92f54f58dd847745c
parent 1d71c7b40a7f38487e602e78f45279b6a8364fc9
author Pannag Sanketi <psanketi@google.com> 1316794091 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1316794091 -0700

am 1d71c7b4: Merge "Returning EOS in SurfaceMediaSource:read" into ics-factoryrom

* commit '1d71c7b40a7f38487e602e78f45279b6a8364fc9':
  Returning EOS in SurfaceMediaSource:read