tree 5e01f03d3bde4e2a94d7d9f26e9536e2c8692f3d
parent da9a2a3162da82b84b9d75243dbe2607b543fc38
parent 3dd9bf1d012eb450641f8c1a4ba04ebc394ac0ec
author Marco Nelissen <marcone@google.com> 1389986648 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1389986648 -0800

am 3dd9bf1d: Merge "Revert "Create new ID3v2 metadata test""

* commit '3dd9bf1d012eb450641f8c1a4ba04ebc394ac0ec':
  Revert "Create new ID3v2 metadata test"