App sidebar (2/2)

Change-Id: I9aae5e80960e5037e7aa69019004d4dda91f282a

Conflicts:
	res/layout/seek_bar_preference.xml
	res/values-ko/cm_strings.xml
	res/values/attrs.xml
	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	res/xml/system_ui_settings.xml
remove unnecessary file
Settings: Inaccurate proximity switch (1/2)

Change-Id: I755b94d2200fb42f2f19fad20b0c9fab29eb1e69

Conflicts:
	res/values/cr_strings.xml
	res/xml/display_settings.xml
	src/com/android/settings/DisplaySettings.java
fix recent merge