Merge remote-tracking branch 'remotes/aosp/jb-mr1.1-release' into jb-4.2

Conflicts:

	src/com/android/deskclock/AlarmAlertFullScreen.java
	src/com/android/deskclock/AlarmClock.java
	src/com/android/deskclock/DeskClock.java
	src/com/android/deskclock/ScreensaverActivity.java
	src/com/android/deskclock/SettingsActivity.java
	src/com/android/deskclock/Utils.java
fix conflits