Some fixes

	modified:   res/values/pa_arrays.xml
	modified:   res/xml/perf_profile_settings.xml
	modified:   res/xml/tool_bar_settings.xml
	modified:   src/com/android/settings/SettingsPreferenceFragment.java

Conflicts:
	res/values/pa_arrays.xml
	res/xml/perf_profile_settings.xml
	res/xml/tool_bar_settings.xml