Clean up
Signed-off-by: Kristofer Ard <kristoferard@gmail.com>
Add moar timeout/redisplay values
Signed-off-by: Kristofer Ard <kristoferard@gmail.com>
Custom Carrier Label (2/2)

Change-Id: Ib9af0419bfcbe9285ecc47770fb0504518d1d344
Signed-off-by: Kristofer Ard <kristoferard@gmail.com>

Conflicts:
	res/values/cmx_strings.xml
	src/com/android/settings/DisplaySettings.java
Customizable Low battery pop-up warning (2/2)

Change-Id: I86d3b348cbabec3f34b047589d7f0a03b069cfae
Signed-off-by: Kristofer Ard <kristoferard@gmail.com>

Conflicts:
	res/values/cmx_arrays.xml
	res/values/cmx_strings.xml
Derp
Signed-off-by: Kristofer Ard <kristoferard@gmail.com>
Move things around to hopefully fix FC
Signed-off-by: Kristofer Ard <kristoferard@gmail.com>
settings: Deprecate has_led_flash, move to framework.

 * We need this to configure default tiles in SystemUI so move it.
 * Leave the old one in place so we don't kill every device.

Change-Id: I883f9595f74ab52c8c8152e0105400aaefff4afe
OCD
Signed-off-by: Kristofer Ard <kristoferard@gmail.com>
Merge branch 'jb-mr2' into halo