am dc04f537: (-s ours) am a5c4aeba: Merge "DO NOT MERGE - Revised ringtones from Ali Spagnola (revision 2)" into gingerbread

* commit 'dc04f53703f68f0a4fb13858cbf71b760cf48368':
  DO NOT MERGE - Revised ringtones from Ali Spagnola (revision 2)