am 1f61ad17: (-s ours) am 3810c08b: Merge "DO NOT MERGE - Fixing ringtones that were put in as notifications" into gingerbread

This commit is contained in:
Justin Ho
2010-10-26 16:10:57 -07:00
committed by Android Git Automerger

Diff Content Not Available