Merge branch 'cm-12.0' of git://github.com/CyanogenMod/android_packages_apps_DeskClock into cm-12.0