Merge tag 'android-4.2.2_r1' into HEAD

Android 4.2.2 release 1

Conflicts:
	res/xml/settings.xml
	src/com/android/deskclock/ScreensaverActivity.java
	src/com/android/deskclock/SettingsActivity.java
	src/com/android/deskclock/Utils.java

Conflicts:

	res/xml/settings.xml
	src/com/android/deskclock/AlarmAlertFullScreen.java
	src/com/android/deskclock/AlarmClock.java
	src/com/android/deskclock/DeskClock.java
	src/com/android/deskclock/SettingsActivity.java
fix errors from 4.2.2 merge