OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2e9311c
f424890
)
am 1d71c7b4: Merge "Returning EOS in SurfaceMediaSource:read" into ics-factoryrom
author
Pannag Sanketi
<psanketi@google.com>
Fri, 23 Sep 2011 16:08:11 +0000
(09:08 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Fri, 23 Sep 2011 16:08:11 +0000
(09:08 -0700)
* commit '
1d71c7b40a7f38487e602e78f45279b6a8364fc9
':
Returning EOS in SurfaceMediaSource:read
Trivial merge