tree 0b7f731f5693986570f066b620df843c4aaac816
parent c03a63f1afb3ca52108311b2c9abec6476c9c05b
parent 57fa22256e5f78cec3cd062fc8fee153560ebb59
author Andreas Huber <andih@google.com> 1284065333 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284065333 -0700

am f0eab98c: am a063cd64: Merge "Instead of asserting, publish no tracks if an MP3Extractor is used on non-mp3 content." into gingerbread

Merge commit 'f0eab98c4ef7449eb5a5ef659cd794e0003216b3'

* commit 'f0eab98c4ef7449eb5a5ef659cd794e0003216b3':
  Instead of asserting, publish no tracks if an MP3Extractor is used on non-mp3 content.