Active display [squashed] (2/2)

Change-Id: If15f748a9bb8ad3b82d7b9944b0b456fdbabd9fe

Conflicts:
	res/values/cr_strings.xml

Conflicts:
	res/layout/seek_bar_preference.xml
	res/values/cr_arrays.xml
	res/values/cr_strings.xml

Conflicts:

	res/layout/seek_bar_preference.xml
	res/values/jisoo_attrs.xml
FULL ActiveDisplay Settings

Pac : Pimp up ActiveDisplay
f7a3e64fa3 Browse code
Der-Schubi authored

OmniGears: Fix pimp up ActiveDisplay …
9852cc52b6 Browse code
micku7zu authored

Change-Id: I51b2943829564910a3955d7f56fa7f872741e637

Conflicts:
	res/values/cr_arrays.xml
	res/values/cr_strings.xml
	res/xml/active_display_settings.xml
	res/xml/system_ui_settings.xml
	src/com/android/settings/ose/ActiveDisplaySettings.java

Conflicts:

	res/values/jisoo_attrs.xml
	res/values/slim_strings.xml
	res/xml/active_display_settings.xml
	res/xml/misc_tweaks.xml