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

Merge commit '61a2c04ffedfcd963b1b8bcb310ab12b0d7e9dd4' into eclair-mr2-plus-aosp

* commit '61a2c04ffedfcd963b1b8bcb310ab12b0d7e9dd4':
  Add new notifications and ringtones.