Small Changes for OSE
Change to OSE
Move advanced settings up
[3/3] settings: Change density on the fly

Change-Id: Ifd036c75f0423c334f8e25aaf6b3229833e779d7

Conflicts:
	src/com/android/settings/ose/InterfaceSettings.java
Developer options enabled by default
Merge remote-tracking branch 'slim/kk4.4' into ose

Conflicts:
	res/values/ose_strings.xml
PropModder

Change-Id: I711d67a7b2f2bfda1e375d61ffd16b0b3d04e8d3
Signed-off-by: timpohladthomas <timpohladthomas@gmail.com>
Configurable init.d

Change-Id: Ibeefb9d7e6e79f1536c1e2d0793c9b1adc1eea12
Signed-off-by: timpohladthomas <timpohladthomas@gmail.com>
Merge remote-tracking branch 'slim/kk4.4' into ose

Conflicts:
	res/values/ose_strings.xml
	src/com/android/settings/Settings.java
Slim >>> OSE
Merge remote-tracking branch 'slim/kk4.4' into ose

Conflicts:
	res/values-hu/ose_strings.xml
	src/com/android/settings/SecuritySettings.java
Merge remote-tracking branch 'slim/kk4.4' into ose

Conflicts:
	src/com/android/settings/ose/quicksettings/QuickSettingsTiles.java
	src/com/android/settings/ose/quicksettings/QuickSettingsUtil.java
Merge remote-tracking branch 'slim/kk4.4' into ose
(1/2) Allow disabling of FC dialogs

Change-Id: If2038016dc5bf80cb6cb9637e991b925489ab69e

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
	res/xml/dirtytweaks.xml
Merge remote-tracking branch 'slim/kk4.4' into ose

Conflicts:
	res/values/ose_arrays.xml
	res/values/ose_strings.xml
Merge remote-tracking branch 'slim/kk4.4' into ose

Conflicts:
	res/values/ose_arrays.xml
Settings: Add bridge to PerformanceControl

Change-Id: I259323366ca0aac8b8d334bc9629dec5acc9108a

Conflicts:

	Android.mk
	res/values/custom_strings.xml
	res/xml/settings_headers.xml
	src/com/android/settings/Settings.java

Conflicts:
	Android.mk
	res/xml/settings_headers.xml
Merge remote-tracking branch 'slim/kk4.4' into ose
Merge remote-tracking branch 'slim/kk4.4' into ose

Conflicts:
	src/com/android/settings/Settings.java
Merge remote-tracking branch 'slim/kk4.4' into ose

Conflicts:
	src/com/android/settings/ose/quicksettings/QuickSettingsTiles.java
	src/com/android/settings/ose/quicksettings/QuickSettingsUtil.java