am ca9a083b: am e43e563e: Merge "Don\'t check whether a specific named...

am ca9a083b: am e43e563e: Merge "Don\'t check whether a specific named activity supports mp3 playback, just that there is at least one that does. Fixes bug 2534382. Change-Id: I00d9ac49bd91f161388d5c3de47b1b6abe9e8d9c" into froyo

Merge commit 'ca9a083bcf1ad753812e14f506c210a2104342c5' into kraken

* commit 'ca9a083bcf1ad753812e14f506c210a2104342c5':
  Don't check whether a specific named activity supports mp3 playback,