Merge commit '19340d213c4bd4428f940a12d82a494f9e7cfaa6' into froyo-plus-aosp * commit '19340d213c4bd4428f940a12d82a494f9e7cfaa6': Labeled categories to help clarify Sound prefs.
Merge commit '19340d213c4bd4428f940a12d82a494f9e7cfaa6' into froyo-plus-aosp * commit '19340d213c4bd4428f940a12d82a494f9e7cfaa6': Labeled categories to help clarify Sound prefs.