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)
tree: cf5ad4bb7114fc4e9a82d70dff3f9192a792aa40
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE