am e03cc0f3: Merge change 21112 into donut

Merge commit 'e03cc0f3aa2eb5b1e3b2f726f20e246ac56a8c87' into eclair

* commit 'e03cc0f3aa2eb5b1e3b2f726f20e246ac56a8c87':
  Fix memory leaks in music app.