tree d0e7f2ff03e4a7123ea5a6c7063d6af84c4abe96
parent 7e36e0c3b73445c5c6b5827bb3b64ef3f70b5101
parent f0eab98c4ef7449eb5a5ef659cd794e0003216b3
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.