OSDN Git Service

am c2fd35f7: am 57c332bd: am c024de3c: media: ignore null InputStream
authorRonghua Wu <ronghuawu@google.com>
Tue, 13 Oct 2015 15:50:57 +0000 (15:50 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 Oct 2015 15:50:57 +0000 (15:50 +0000)
commitf807c4fc9e9a67aeec2c761e391dc1ed7ace3b1a
tree364bf8049ff40a7ca32eaf49ec953abd713042f5
parentac86c21c4ca58466c39a0b4f674160c9f17a2a20
parentc2fd35f7ae51d83b3d8f7f46c70e351bf0f18235
am c2fd35f7: am 57c332bd: am c024de3c: media: ignore null InputStream

* commit 'c2fd35f7ae51d83b3d8f7f46c70e351bf0f18235':
  media: ignore null InputStream
media/java/android/media/MediaPlayer.java