am 85a1ee30: am b683f354: am 69abccc3: Merge "MediaStore.Audio.Media.getContentUriForPath() returns unexpected content"
am 85a1ee30: am b683f354: am 69abccc3: Merge "MediaStore.Audio.Media.getContentUriForPath() returns unexpected content"

# By Jan Bjernler
# Via Android Git Automerger (2) and Gerrit Code Review (2)
* commit '85a1ee30215190b1782127a6afe323f4df4ef131':
  MediaStore.Audio.Media.getContentUriForPath() returns unexpected content

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base