fixes
	modified:   core/java/android/provider/Settings.java
	modified:   packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java
	modified:   packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java