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:
b9cabc7
ffd0906
)
Merge \\"MediaPlayer: fix java doc for setSurface and setDisplay.\\" into nyc-dev...
author
Wei Jia
<wjia@google.com>
Tue, 14 Jun 2016 18:59:56 +0000
(18:59 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 14 Jun 2016 18:59:56 +0000
(18:59 +0000)
am:
ffd09065a3
Change-Id: I5ac47afdfa0b5e6cd59d3423eea12b9cad3a31d5
1
2
media/java/android/media/MediaPlayer.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
media/java/android/media/MediaPlayer.java
Simple merge
OSDN Git Service
