Remove superuser icons and settings menu
Cleanup liquid arrays and adjust strings
Revert "Vibration multiplier interface option"

This reverts commit bd0db891105d071de76126ed980711049d4c9982.

Conflicts:
	res/values/liquid_arrays.xml
	res/xml/liquid_interface_settings.xml
	src/com/android/settings/liquid/InterfaceSettings.java
Move vibration multiplier to sound settings
Revert "Settings: add better dialog handling for adb over network"

This reverts commit 6f42a2b88867b5849353f2f2c7394817451af76c.
Revert "media scanner on boot options"

This reverts commit 06c8a42d0c9d238fe42e445b8505a2a3fca9cd1f.

Conflicts:
	src/com/android/settings/DevelopmentSettings.java
Revert "Development Settings: fix setting reset on disable"

This reverts commit 6478d90b23599cccdc548d509fcb636adf8206ba.

Conflicts:
	src/com/android/settings/DevelopmentSettings.java
Revert "Port "Option to hide Adb notification icon""

This reverts commit 57bcca9bb6abe1cf36d2f6c65cfda6369e97bb19.

Conflicts:
	res/values/liquid_strings.xml
Revert "Settings: Forward port ADB over network (Part 1 of 2)"

This reverts commit c6643a520e61e022036daea39bcf4f814460d2ba.

Conflicts:
	res/values/liquid_strings.xml
	res/xml/development_prefs.xml
	src/com/android/settings/DevelopmentSettings.java
Revert "Add an option to change the device hostname (2/2)."

This reverts commit f72a67fd381e51dc6c49546aa6c9cac2f9022d78.

Conflicts:
	res/values/liquid_strings.xml
Revert "Settings: Listanimation views and interpolator (2/2)"

This reverts commit 02cebc117d01c51872702f755d87ae8648a6cf1b.

Conflicts:
	res/values/liquid_arrays.xml
	res/values/liquid_strings.xml
	res/xml/liquid_interface_settings.xml
	src/com/android/settings/liquid/InterfaceSettings.java
Revert "Custom carrier label"

This reverts commit 4c3e6fe59a538ef6bbeb7e619e7c389127cbb56f.

Conflicts:
	res/values/liquid_strings.xml
	res/xml/liquid_interface_settings.xml
	src/com/android/settings/liquid/InterfaceSettings.java
Forward Port: Hide USB Debugging Icon 2/2

Change-Id: Ide823f42070b7b472308658fc85efb5b43f83b01

Conflicts:
	res/values/strings.xml
[2/2] settings: Add support for ADB over network

This patch actually consists of three parts. SlimKat has already patched the ADB service in vendor/slim: init.local.rc

Conflicts:
	res/values/slim_strings.xml

Change-Id: Ic6454dc7e0c910b485dc0f8a19e40d159040455e
Add an option/category in Dev Set to customize the device hostname (2/2).

PS2:
- cleanup

Change-Id: Iee14e90fa6fb6a13a123d92b7cf6dceaf6d18ffc

Conflicts:
	res/values/liquid_strings.xml
Return: Listanimation views and interpolator [2/2]

Hard Rebase

Change-Id: Ia7917ab646d8d05bae8042ecd9cbb7ec722077a7

Conflicts:
	res/values/liquid_arrays.xml
	res/values/liquid_strings.xml
Settings: add better dialog handling for adb over network

thanks fusionjack for this

his fix was accidentally removed

Change-Id: Icc09585f719e743ba5bd8b830586f2ebc0018a71
MediaScanner behavior on boot (3/3)

Lets you enable/disable/ask (with a notification) media scanning on boot.
Can speed up boot and reduce initial boot lag from MediaScanner

Change-Id: Ib09f2de2b3ae3e62eb59be681cf48e0bce14ef17

Conflicts:
	res/values/slim_arrays.xml
	res/values/slim_strings.xml
	res/xml/settings_headers.xml
Settings: add Device on Advanced Options for device-specific settings

Based off http://tinyurl.com/q8vh3zd

Change-Id: I03fbd32186b3c4fad724d7c71bf7dde647ec191f

Conflicts:
	res/values/liquid_strings.xml
	src/com/android/settings/liquid/AdvancedSettings.java
Revert "Set circle charging animation default to none"

This reverts commit e05ef8d6f4da0f432e9803653641656e420c35ac.