am 3810c08b: Merge "DO NOT MERGE - Fixing ringtones that were put in as notifications" into gingerbread
am 3810c08b: Merge "DO NOT MERGE - Fixing ringtones that were put in as notifications" into gingerbread

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base