add settings for clock styles

Change-Id: Ib418213f71bcfefc32cb57abe6148276f8b25851
Merge branch 'mr1-staging' of git://github.com/CyanogenMod/android_packages_apps_Settings into cm_merge

Conflicts:
	res/values/strings.xml

Change-Id: I88d2d8060e2308c4fac671965f28aa8ab85d9650
Merge branch 'mr1-staging' of https://github.com/CyanogenMod/android_packages_apps_Settings into mr1-staging
Merge branch 'mr1-staging' of https://github.com/CyanogenMod/android_packages_apps_Settings into mr1-staging
removed duplicated clock settings from merge
clock settings changes
Merge branch 'mr1-staging' of https://github.com/CyanogenMod/android_packages_apps_Settings into mr1-staging
move clock settings menu back to system settings
Merge branch 'mr1-staging' of https://github.com/CyanogenMod/android_packages_apps_Settings into mr1-staging
Merge branch 'mr1-staging' of https://github.com/CyanogenMod/android_packages_apps_Settings into mr1-staging
Add optional phone status bar volume slider

Change-Id: I95b6488cdca4f94da9c18ada0a28da38067ca5ae

Conflicts:
	res/values/strings.xml
Merge branch 'mr1-staging' of https://github.com/CyanogenMod/android_packages_apps_Settings into mr1-staging
Revert "Settings: Anonymous Statistics (CMStats)"

This reverts commit 9c19f8b74fb7ca9854ae469ff3f5a0fab9407429.

Conflicts:
	res/values/strings.xml
	res/xml/device_info_settings.xml
Revert "Settings: Add Updater and Changelog"

This reverts commit 31d93bf306ceb46b4f6cfdc86c0497a4a2565123.

Conflicts:
	res/values/strings.xml
	res/xml/device_info_settings.xml
how could i miss this one?
Power menu: allow enabling user switcher

Change-Id: I6a8d2e25beb1c4def60a7cee440df0fb66f169b1
Merge branch 'mr1-staging' of https://github.com/CyanogenMod/android_packages_apps_Settings into mr1-staging
highend gfx effects + introducing misc settings

Change-Id: Ic1a0531926fc11298179d47fbcbb624b2648bcfd

Conflicts:
	res/values/strings.xml
	res/xml/system_settings.xml
	src/com/android/settings/cyanogenmod/SystemSettings.java
configurable back kill timeout. settings part

Change-Id: Ied22808b0e3a80ce54bb4cce9aab83d396f404f1

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
	res/xml/system_settings.xml
	src/com/android/settings/cyanogenmod/SystemSettings.java
move 'kill app longpress back' to misc settings

Change-Id: I47aeaaba5496aaea0968a98bf39f598d8de9edd9

Conflicts:
	res/xml/misc_settings.xml
	src/com/android/settings/cyanogenmod/MiscSettings.java