OSDN Git Service
(root)
/
android-x86
/
system-media.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c1e8c41
320e3f8
)
Merge "Fix 5249076 Don't let the shared memory buffer drain"
author
Jean-Michel Trivi
<jmtrivi@google.com>
Tue, 6 Sep 2011 23:23:09 +0000
(16:23 -0700)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Tue, 6 Sep 2011 23:23:09 +0000
(16:23 -0700)
1
2
wilhelm/src/android/MediaPlayer_to_android.cpp
patch
|
diff1
|
diff2
|
blob
|
history
wilhelm/src/android/android_StreamPlayer.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
wilhelm/src/android/MediaPlayer_to_android.cpp
Simple merge
diff --cc
wilhelm/src/android/android_StreamPlayer.cpp
Simple merge