Settings: Add preference for EdgeGesture service.

Change-Id: I0325b0a9aa6eb943b48483aebe151726a2c64ac4
QS: Make it possible to show smaller icons (2/2)

Change-Id: I974a8e17dfc5ae6b62af1ec87129c6f04508a865
CM PlatLogo: CyanogenMod version preference (2/2)

Binds the CyanogenMod version preference to launch CM easter egg
upon multiple taps.

Change-Id: I8e06642944d24581c0932c9964f2d9615bfcb832
Settings: Day and week on data usage cycle (2/2)

Adds the ability to set day and week on when the data usage
graph resets, instead of just month.

Change-Id: I5974e1b7143d09ffd6fcd6db113c3f7511346bfa

Conflicts:
	res/values/cm_arrays.xml

	modified:   res/layout/data_usage_cycle_editor.xml
	modified:   res/values/cm_arrays.xml
	modified:   res/values/strings.xml
	modified:   src/com/android/settings/DataUsageSummary.java
	modified:   src/com/android/settings/net/NetworkPolicyEditor.java
Move lockscreen buttons options to one place

When you enter "Button actions" you expect to find unlock
options there, not in "Screen security -> Additional options".
Before: http://goo.gl/mX9DMQ
After: http://goo.gl/hPDKyt

Change-Id: Id9913024a46b0237dd2a1a9b0959eaa84aff379b
Revert "Move lockscreen buttons options to one place"

This reverts commit 2bb891c4d3aa5f5fbf56550192d5e41339434623.
Merge pull request #1 from CyanogenMod/cm-11.0

Cm 11.0
Merge pull request #2 from CyanogenMod/cm-11.0

Cm 11.0
Merge pull request #3 from CyanogenMod/cm-11.0

Better expose 'QS Tiles and layout' function
Merge pull request #4 from CyanogenMod/cm-11.0

Cm 11.0
Merge pull request #5 from CyanogenMod/cm-11.0

Cm 11.0
Merge pull request #6 from CyanogenMod/cm-11.0

settings: open add tile dialog
Merge pull request #7 from CyanogenMod/cm-11.0

Revert "settings: open add tile dialog"
Merge pull request #8 from CyanogenMod/cm-11.0

Cm 11.0
Merge pull request #9 from CyanogenMod/cm-11.0

Cm 11.0
Merge pull request #10 from CyanogenMod/cm-11.0

Cm 11.0
Merge pull request #11 from CyanogenMod/cm-11.0

Cm 11.0
Merge pull request #12 from CyanogenMod/cm-11.0

Cm 11.0
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_Settings into CyanogenMod-cm-11.0

Conflicts:
	res/xml/development_prefs.xml

	modified:   res/values/cm_arrays.xml
	modified:   res/values/cm_strings.xml
	modified:   res/xml/development_prefs.xml
Merge pull request #14 from CyanogenMod/cm-11.0

Cm 11.0