more
Development : add animation scale util
 * Use a seekbar preference to allow setting arbitrary animation scale values

Change-Id: I4ceaf0dc74e6e044e36cf3652bfc1efb33890380

Conflicts:
	res/xml/display_settings.xml
	res/xml/system_ui_settings.xml
	src/com/android/settings/DisplaySettings.java
remove changes
Switch to prebuilt SuperSU (1/2)

Conflicts:
	res/xml/settings_headers.xml
Add back Fast Torch

Conflicts:
	res/values/cm_strings.xml
	res/xml/hardwarekeys_settings.xml
Settings: make touch slop configurable [1/2]

Conflicts:
	res/values/bk_strings.xml
	res/xml/scroll_animation_interface_settings.xml
	src/com/android/settings/crom/ScrollAnimationInterfaceSettings.java
Custom OverScroll Settings and Style (2/2)

Conflicts:
	res/values/bk_arrays.xml
	res/values/bk_strings.xml
	res/xml/scroll_animation_interface_settings.xml
	src/com/android/settings/crom/ScrollAnimationInterfaceSettings.java
Port back Gesture Edge Navigation (2/2)

Conflicts:
	res/drawable-xhdpi/ic_bars.png
	res/values/attrs.xml
	res/values/bk_arrays.xml
	res/values/bk_strings.xml
	res/xml/chaos_lab_prefs.xml
Hover :  exclude from insecure lockscreen (2/2)
Enable/disable hover notifications from insecure lockscreen

Conflicts:
	res/values/bk_strings.xml
	res/xml/hover_settings.xml
Add EdgeService Checkbox

Conflicts:
	res/values/cm_strings.xml