Halo (1/2)

Change-Id: Ib623ea74e9cf308dd8e7cbfe79c81b90c789fc01

Conflicts:

	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java