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 '85a1ee30':
MediaStore.Audio.Media.getContentUriForPath() returns unexpected content