am 374aee68: Switch to use software MP3 decoder Hardware MP3 decoder could...
am 374aee68: Switch to use software MP3 decoder Hardware MP3 decoder could lead to hang in the Music application, although the chance is very low.
Merge commit '374aee68' into froyo-plus-aosp
* commit '374aee68':
Switch to use software MP3 decoder