Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/packages/apps/DeskClock into 1.1

Android 4.2.2 release 1

Conflicts:
	res/xml/settings.xml
	src/com/android/deskclock/AlarmAlertFullScreen.java
	src/com/android/deskclock/AlarmKlaxon.java
	src/com/android/deskclock/DeskClock.java
	src/com/android/deskclock/SettingsActivity.java

Change-Id: Ieba9c47923469713cf14c310044fe8fb3b31523c