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

Conflicts:
	res/layout/alarm_time.xml
	res/values/strings.xml
	res/xml/alarm_prefs.xml
	src/com/android/deskclock/Alarm.java
	src/com/android/deskclock/AlarmClock.java
	src/com/android/deskclock/AlarmKlaxon.java
	src/com/android/deskclock/Alarms.java
	src/com/android/deskclock/HandleSetAlarm.java
	src/com/android/deskclock/SetAlarm.java

Change-Id: Ic018938af462fcf0517d54ba17f5015a5f7a158c
Signed-off-by: KainGC <cows_say_potato@yahoo.com>
Merge branch 'jb-mr1' of https://github.com/KainGC/packages_apps_DeskClock into jb-mr1

Conflicts:
	src/com/android/deskclock/SetAlarm.java

Change-Id: I360bfac830305589be443746ce4644e2bf746edc
Signed-off-by: KainGC <cows_say_potato@yahoo.com>