tree 5eb9bff4b90bcb4dfc163e4784a7e199d09d8d8f
parent 1c25dcc92435aac0383e860e55ad9a8dc6185820
parent e58cd37d6667c8812ab8d40dd814f77eb7df1b96
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.