Merge remote-tracking branch 'jelly42/jb-mr1' into jb-mr1

Conflicts:
	res/layout/alarm_time.xml
	res/values-es/strings.xml
	src/com/android/deskclock/AlarmKlaxon.java

Change-Id: I5a6cf7d76127c0fceda20c95d192f9aa4326993c