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:
15a1fc3
f807c4f
)
am f807c4fc: am c2fd35f7: am 57c332bd: am c024de3c: media: ignore null InputStream
author
Ronghua Wu
<ronghuawu@google.com>
Tue, 13 Oct 2015 15:56:53 +0000
(15:56 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Tue, 13 Oct 2015 15:56:53 +0000
(15:56 +0000)
* commit '
f807c4fc9e9a67aeec2c761e391dc1ed7ace3b1a
':
media: ignore null InputStream
Trivial merge