Merge tag 'android-4.3_r3.1' of https://android.googlesource.com/platform/packages/apps/DeskClock into cm-10.2

Android 4.3 Release 3.1

Change-Id: I4bcb112bf5e12df67df2db3b8590c5f4a289da06