Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_packages_apps_LockClock into killrom
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_packages_apps_LockClock into killrom
Merge commit 'fb1cf3fb8f835cf678150eb968ca2962199c1582'; branch 'tdkrom' into tdkrom

* commit 'fb1cf3fb8f835cf678150eb968ca2962199c1582':

* tdkrom: