RB Settings: LCD Density Changer
Merge tag 'android-4.2.2_r1' into HEAD

Conflicts:
	AndroidManifest.xml
	res/values-cs/strings.xml
	res/values/strings.xml
	src/com/android/settings/ChooseLockGeneric.java
	src/com/android/settings/ChooseLockPatternTutorial.java
	src/com/android/settings/Settings.java
Merge commit 'a70b015ef659e190be60c99b80233aa59eb02d50' into jb-mr1

Conflicts:
	AndroidManifest.xml
	res/values-cs/strings.xml
	res/values/strings.xml
	res/xml/crom_settings.xml
	src/com/android/settings/ChooseLockGeneric.java
	src/com/android/settings/Settings.java
	src/com/android/settings/rb/About.java