tree 6ca310606cc8eca244bad34907fd7759836cb772
parent 413f750501c4392e096c7bed27af0764cbadeb94
parent a5e3408769b5d64eafc9e325c5d3a4de35d53103
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.