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:
91ec9a6
0dd714e
)
MediaPlayerService: allow next player to be NULL am: 2828412787 am: f4e00a7c5a
author
Wei Jia
<wjia@google.com>
Wed, 31 Aug 2016 00:08:25 +0000
(
00:08
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 31 Aug 2016 00:08:25 +0000
(
00:08
+0000)
am:
0dd714e408
Change-Id: Ib620e8573ff6da861c101311143d266fd5086d7b
1
2
media/libmediaplayerservice/MediaPlayerService.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
media/libmediaplayerservice/MediaPlayerService.cpp
Simple merge