Translate
duplicate value
Halo: Add master switch to disable Halo (2/2)

Conflicts:
	res/values-es/strings.xml
	res/values/strings.xml
	src/com/android/settings/narp/HaloControl.java

mbc596

Conflicts:
	res/values-es/strings.xml
	res/values/strings.xml
Keyboard (2/2)
Translates
Display options: allow configuration of wake on plug behavior

Bring in user interface layout

Conflicts:
	res/values/ras_strings.xml
	res/xml/system_settings.xml

Conflicts:
	res/values/strings.xml
	res/xml/system_settings.xml
Power connect/disconnect notification

Conflicts:
	res/values/ras_strings.xml
	src/com/android/settings/narp/UserInterfaceSettings.java

Conflicts:
	res/values/strings.xml
Add listview animations - thinking bridge

Signed-off-by: scott <scott@ubuntu.com>

Change-Id: Id596358597b7b62f4b1bf9c360795256ee718490

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
	res/xml/user_interface_settings.xml
	src/com/android/settings/cyanogenmod/UserInterface.java

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
Add header
Notification counter (2/2)
Add active display to ChameleonOS [2/2]

PS2:
Add pocket mode option, available if the device has
a proximity sensor.

PS3:
Add option to include ongoing and non-clearable notifications.

PS4:
Allow brightness control from 0% to 100%

PS5:
Refactor for release

Change-Id: Iae55640a31df68542c2af5d95097811b8fb1f66f

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
	res/xml/system_settings.xml

Conflicts:
	res/values/arrays.xml
Fix up active display options layout.  (Fixes force close)
Signed-off-by: scott <scott@ubuntu.com>

Change-Id: I5ba46e771895ccf7e437f0bfb51ee788906cb636

Conflicts:
	res/values/attrs.xml
	res/xml/active_display_settings.xml
Active display: Add sunlight mode. [2/2]

Change-Id: I513c2ef1555ca48dfb553f80ca687d1ca9f27c55

Conflicts:
	res/values/strings.xml
	src/com/android/settings/beanstalk/ActiveDisplaySettings.java
Sidear: FIX
Multiple commits for app sidebar support from ChameleonOS
Signed-off-by: scotthartbti <scott.hart.bti@gmail.com>

Change-Id: Ib0645179962c405a73e9137ffae103cb9838e3fc

Conflicts:
	AndroidManifest.xml
	res/values/arrays.xml
	res/values/attrs.xml
	res/values/strings.xml
	res/xml/system_settings.xml

Conflicts:
	AndroidManifest.xml
	res/values/arrays.xml
	res/values/strings.xml