Merge "DO NOT MERGE - Updated ringtones for Crespo, fixing looping problem" into gingerbread