OSDN Git Service

am 91d34137: am 1d71c7b4: Merge "Returning EOS in SurfaceMediaSource:read" into ics...
authorPannag Sanketi <psanketi@google.com>
Fri, 23 Sep 2011 16:10:41 +0000 (09:10 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 23 Sep 2011 16:10:41 +0000 (09:10 -0700)
* commit '91d34137903c278e5e077fa1edef9bbbcdd140f7':
  Returning EOS in SurfaceMediaSource:read


Trivial merge