tree aa37aeedd4c59353a7845fef6e793b10e8d190b4
parent 6d4346ce35a521d67f45d7c9658c450c0fc461d2
parent 8ac0983edafa064126c4480dd31047d1bb4ce111
author Andreas Huber <andih@google.com> 1282776200 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282776200 -0700

am 8ac0983e: Merge "Fix support for per-frame unsynchronization in ID3V2.4 tags." into gingerbread

Merge commit '8ac0983edafa064126c4480dd31047d1bb4ce111' into gingerbread-plus-aosp

* commit '8ac0983edafa064126c4480dd31047d1bb4ce111':
  Fix support for per-frame unsynchronization in ID3V2.4 tags.