Fix the dialog tapping Network settings
Power menu into navring targets (2/2)

Change-Id: I95644d60b2d4db6d109bd4c75c007a43af52a2fa

Conflicts:
	res/values/cr_strings.xml
Navring last app toggle (2/2)

Change-Id: If8616d82fb12ff860d56bec2033c7d6ac7d00b5c

Conflicts:
	res/values/cr_strings.xml
[2/2] settings: Add Haptic Feedback to quicktiles
Derp!
Quick Settings: Option to use floating window (2/2)

Allows the option of launching preferences from the quicksettings menu in a
floating window

Change-Id: I00237f6b667d35f0e8d2cf8201f4efee6adf762c

Conflicts:
	res/values/cm_strings.xml
	res/xml/quick_settings_panel.xml
Merge CM
Add network usage stats to status bar (2/2)
Change-Id: I667f76cb486d67906025e1fee61a46ff4ebc1fb2

Conflicts:

	res/values/cr_strings.xml

Conflicts:
	res/values/cr_arrays.xml
	res/values/cr_strings.xml
Network stats custom colors (2/2)

Change-Id: I55ff6f4fcf23fcfc795a1ce784c580ff41ed317e

Conflicts:

	res/values/cr_strings.xml

Conflicts:
	res/values/cr_strings.xml
Network stats: Hide if there's no traffic (2/2)

Change-Id: Idc37765c73b7a7892b4d27259309e0038e4fcae8

Conflicts:
	res/values/cr_strings.xml
settings: add back notification shortcuts + slim classes we need

this will add back slims notification shorcuts feature as well
we add common slim classes we use for navbar navring pie etc
see fb commit for more details

Change-Id: I798d6597a8894fa47718fa6310b7965239130a3a

Conflicts:
	res/drawable-hdpi/ic_grabber.png
	res/drawable-mdpi/ic_grabber.png
	res/drawable-xhdpi/ic_grabber.png
	res/drawable-xxhdpi/ic_grabber.png
	res/layout/buttons_list_view_main.xml
	res/values/cr_arrays.xml
	res/values/cr_strings.xml

Thanks to @temasek cherry-picked from: d96987e3637825d063e1b380fb21be47b4d1f0a2
Revert "Change Colorpicker"

This reverts commit 201bdcb0bb2fe6cbaeb4ec1529f006deeaa79deb.

Conflicts:
	src/com/android/settings/axxion/LockscreenNotifications.java
Revert "[1/2] Settings: HALO Colors"

This reverts commit ce6c286136dda263760b20a63339155666edb9bc.

Conflicts:
	res/values/axxion_strings.xml
	res/values/colors.xml
	res/xml/halo_settings.xml
HALO : Custom colors of all the stuff (2/2)

- add custom color mode support

Conflicts:
	res/values/hk_strings.xml
	res/xml/halo_settings.xml
	src/com/android/settings/axxion/Halo.java
Colorpicker Margaritov

Change-Id: I79c7c2d63a5e2d2cab280ba2ca3564fdc742e08f

Conflicts:
	res/values/cr_strings.xml

Conflicts:
	res/values/cr_strings.xml
Settings: Fix build error

I gorgot to delete the halo color preference screen of the last revert
Revert "settings: add back notification shortcuts + slim classes we need"

This reverts commit 598d332c36d2c0f157ff3ffa6a18d8be57d32be8.

Conflicts:
	res/values/axxion_strings.xml
Live Volume Steps [2/2]

Change-Id: I8ba0a1ac7b6f55a174e685182afb06781448a6c2

Conflicts:
	res/values/axxion_arrays.xml
	res/values/cr_strings.xml
Merge tag '4.4.3_r1.1' into HEAD
Revert "Settings: add equalizer tile toggle"

This reverts commit bf1577e05de395af9f2b3e30b67d7aeee4c3bfee.