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:
ac86c21
c2fd35f
)
am c2fd35f7: am 57c332bd: am c024de3c: media: ignore null InputStream
author
Ronghua Wu
<ronghuawu@google.com>
Tue, 13 Oct 2015 15:50:57 +0000
(15:50 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Tue, 13 Oct 2015 15:50:57 +0000
(15:50 +0000)
* commit '
c2fd35f7ae51d83b3d8f7f46c70e351bf0f18235
':
media: ignore null InputStream
1
2
media/java/android/media/MediaPlayer.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
media/java/android/media/MediaPlayer.java
Simple merge