am 19add066: am bb0db626: Merge change I2a4b120c into eclair

Merge commit '19add066cc637301c3e1523825937d073feb416e' into eclair-mr2-plus-aosp

* commit '19add066cc637301c3e1523825937d073feb416e':
  Add more ringtones. Bug 2219950.