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:
801a3ff
dab70a0
)
Merge "NuPlayerDriver: request seek notification when prepare*() is called in STOPPED...
author
Wei Jia
<wjia@google.com>
Mon, 13 Oct 2014 20:27:43 +0000
(20:27 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Mon, 13 Oct 2014 20:27:43 +0000
(20:27 +0000)
1
2
media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
Simple merge