am 881345b8: am 61a2c04f: am 3ea2ae7d: Merge change I47aa76bf into eclair

Merge commit '881345b81e9fe2a84be2ff3240b57a72961a8720'

* commit '881345b81e9fe2a84be2ff3240b57a72961a8720':
  Add new notifications and ringtones.