am 3ea2ae7d: Merge change I47aa76bf into eclair

Merge commit '3ea2ae7d6f8a73947831c15f970de70730c5a0f6' into eclair-mr2

* commit '3ea2ae7d6f8a73947831c15f970de70730c5a0f6':
  Add new notifications and ringtones.