LCD Wizard dpi changer

Conflicts:

	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	res/xml/user_interface_settings.xml
	src/com/android/settings/SettingsPreferenceFragment.java