Merge change I2a4b120c into eclair

* changes:
  Add more ringtones. Bug 2219950.