tree b6035024a9175fd6c2ac53d37d13d897dfe87d2a
parent 9a2a29ce9ea69382aafd8b895b80f7bbd028cb00
parent 4f8bb114b7180fb1c4e418223b3a608b467d23a2
author Marco Nelissen <marcone@google.com> 1389994430 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1389994430 +0000

am 4f8bb114: am 1526c2e1: am 96a7b5a9: Merge "Long mp3 metadata displays as corrupted file after transfer"

* commit '4f8bb114b7180fb1c4e418223b3a608b467d23a2':
  Long mp3 metadata displays as corrupted file after transfer