commit | 5b4faa4da0761688b678df9bef3cba373a037078 | [log] [tgz] |
---|---|---|
author | Justin Ho <justinho@google.com> | Mon Nov 15 08:57:11 2010 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 15 08:57:11 2010 -0800 |
tree | 8ed5a7094405fe90af701f2d40c05e1db2979ff3 | |
parent | 44d47ad56502a1ccb308a9ec2cd05120a53fac3d [diff] | |
parent | dc04f53703f68f0a4fb13858cbf71b760cf48368 [diff] |
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)