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>
Merge branch 'jb-mr1' of https://github.com/KainGC/packages_apps_DeskClock into jb-mr1

Change-Id: I5993a6ecb9a85647206fc8066d51e028b43ef26a