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