OSDN Git Service

am f807c4fc: am c2fd35f7: am 57c332bd: am c024de3c: media: ignore null InputStream
authorRonghua Wu <ronghuawu@google.com>
Tue, 13 Oct 2015 15:56:53 +0000 (15:56 +0000)
committerAndroid 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