Fix
[1/3] LCD Density changer (credit NamlessRom)

Conflicts:
	res/values/cm_strings.xml
	res/xml/display_settings.xml
	src/com/android/settings/DisplaySettings.java