tree 3a6650be1887d0df229f02dc449f5c2870720e1d
parent 7a6475220dbba9679fc15ef3fa92cd4f9f064615
parent 657dba9e66ff02785c2bf034ebecc3c357cbc333
author Jean-Baptiste Queru <jbq@google.com> 1346948300 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346948300 -0700

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.