am bb0db626: Merge change I2a4b120c into eclair

Merge commit 'bb0db6267851b923a8370355c68adfc3bb30108d' into eclair-mr2

* commit 'bb0db6267851b923a8370355c68adfc3bb30108d':
  Add more ringtones. Bug 2219950.