tree c2ee296a6d04a2fea01ff62a4d083a2dc036efe4
parent 5959988b63ace3fba2fc78b135a4f5ef25dcf860
parent 90e4b45495f806f937fcdb52e18842237fccd5fb
author Andreas Huber <andih@google.com> 1282779633 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282779633 -0700

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

Merge commit 'e58cd37d6667c8812ab8d40dd814f77eb7df1b96'

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