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.
tree: 85380dbe12f043c820e10181d20ae0324f4c0706
  1. camera/
  2. cmds/
  3. include/
  4. media/
  5. services/