Update misc_tweaks.xml
Merge remote-tracking branch 'upstream/ose' into ose
Revert "[3/3] settings: Change density on the fly"

This reverts commit 55c939496a4b6615902a41b02d22d2af1f8a98be.

Conflicts:
	AndroidManifest.xml
	res/values/config.xml
	res/values/ose_arrays.xml
	res/values/ose_strings.xml
	res/xml/ose_interface_settings.xml
	src/com/android/settings/ose/InterfaceSettings.java

Change-Id: Ic5234d8fcf5a99e93f2bb264614d649f9ac0be1c
Update MiscTweaks.java

Density on fly revert
Update ose_interface_settings.xml

fix OSE Extras, settings not getting shown
Re-arrange settings options

Change-Id: Id4740209a98b1ebfc5435e7985a07fe6f2fa42d5