clean up whispertext

Conflicts:
	src/com/android/settings/SettingsPreferenceFragment.java