OSDN Git Service
(root)
/
android-x86
/
frameworks-av.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
58a2b35
3d5ec85
)
am 91d34137: am 1d71c7b4: Merge "Returning EOS in SurfaceMediaSource:read" into ics...
author
Pannag Sanketi
<psanketi@google.com>
Fri, 23 Sep 2011 16:10:41 +0000
(09:10 -0700)
committer
Android 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