Settings: Make it clear that the Lock clock is also a Home widget

Also includes some whitespace cleanup

Change-Id: I446409f3ace482d8321803752d93bd90d9dc5f2c
Settings: Introducing 'Chronus'

Change-Id: Iae59aa31106178bccf170ba693ee888025a4ef0f
Remove or rename duplicate strings

Change-Id: Ib955072f33385ca67081c2bbc589b062cae01a0d
Revert "Remove CMStats and CMUpdater"

This reverts commit 114b87b27dda3926b41533c52a52dfd8dab3e287.

Causes the following NPE:
java.lang.NullPointerException
       at com.android.settings.DeviceInfoSettings.removePreferenceIfPackageNotInstalled(DeviceInfoSettings.java:419)
       at com.android.settings.DeviceInfoSettings.onCreate(DeviceInfoSettings.java:116)
       at android.app.Fragment.performCreate(Fragment.java:1673)
       at android.app.FragmentManagerImpl.moveToState(FragmentManager.java:854)
       at android.app.FragmentManagerImpl.moveToState(FragmentManager.java:1057)
       at android.app.BackStackRecord.run(BackStackRecord.java:682)
       at android.app.FragmentManagerImpl.execPendingActions(FragmentManager.java:1435)
       at android.app.FragmentManagerImpl$1.run(FragmentManager.java:441)
       at android.os.Handler.handleCallback(Handler.java:725)
       at android.os.Handler.dispatchMessage(Handler.java:92)
       at android.os.Looper.loop(Looper.java:137)
       at android.app.ActivityThread.main(ActivityThread.java:5191)
       at java.lang.reflect.Method.invokeNative(Native Method)
       at java.lang.reflect.Method.invoke(Method.java:511)
       at com.android.internal.os.ZygoteInit$MethodAndArgsCaller.run(ZygoteInit.java:795)
       at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:562)
       at dalvik.system.NativeStart.main(Native Method)
   Force finishing activity com.android.settings/.Settings
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_packages_apps_Settings into HEAD
Merge remote-tracking branch 'sgt7/cm-10.1' into cm-10.1-sgt7