fix merge breaks

..

 Changes to be committed:
	new file:   res/drawable-hdpi/ic_settings_performance.png
	new file:   res/drawable-mdpi/ic_settings_performance.png
	new file:   res/drawable-xhdpi/ic_settings_performance.png
	modified:   res/drawable-xhdpi/ic_settings_themes.png
	new file:   res/drawable/ic_settings_cmlauncher.png
	modified:   res/values/strings.xml
	modified:   res/xml/settings_headers.xml
	modified:   src/com/android/settings/DeviceInfoSettings.java