am f52ebbfc: am 9a219519: Merge change I2d32301b into eclair

Merge commit 'f52ebbfc5d1d1abbf1ad39c1e8308fd4029491fb' into eclair-mr2-plus-aosp

* commit 'f52ebbfc5d1d1abbf1ad39c1e8308fd4029491fb':
  Add 4 new notification sounds.