OSDN Git Service

am 657dba9e: am 4aa83ec3: am bb60bc26: Merge "Musicplayer application can not display...
authorJean-Baptiste Queru <jbq@google.com>
Thu, 6 Sep 2012 16:18:20 +0000 (09:18 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 6 Sep 2012 16:18:20 +0000 (09:18 -0700)
commitc67fb6c39e75a08e50977e143d7ae7bd11e2604c
tree3a6650be1887d0df229f02dc449f5c2870720e1d
parent7a6475220dbba9679fc15ef3fa92cd4f9f064615
parent657dba9e66ff02785c2bf034ebecc3c357cbc333
am 657dba9e: am 4aa83ec3: am bb60bc26: Merge "Musicplayer application can not display DRM files of internal storage."

* commit '657dba9e66ff02785c2bf034ebecc3c357cbc333':
  Musicplayer application can not display DRM files of internal storage.
media/java/android/media/MediaScanner.java