tree 41068d0acc37723315f09cf173b621c390d73259
parent add08eb454bbe8b3a0a40d23621c102b72cd005d
parent 0b5ba9eeed56a80fed3735f5cd4951477fda79f0
author James Dong <jdong@google.com> 1272305557 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1272305557 -0700

am 31431b34: 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 '31431b34f895862ae13efba30bb5771085572687' into kraken

* commit '31431b34f895862ae13efba30bb5771085572687':
  Switch to use software MP3 decoder