OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7aecaf8
bd45be5
)
Merge \"MediaPlayer: fix java doc for setPlaybackParams.\" into nyc-dev
author
Wei Jia
<wjia@google.com>
Mon, 20 Jun 2016 23:03:20 +0000
(23:03 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 20 Jun 2016 23:03:20 +0000
(23:03 +0000)
am:
bd45be5032
Change-Id: I1b3604fe84dacf3febf324de154cad00fcd688b8
1
2
media/java/android/media/MediaPlayer.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
media/java/android/media/MediaPlayer.java
Simple merge