Merge branch 'qcril' into cm-10.2

Conflicts:
	core/java/android/provider/Settings.java
	core/res/res/values/strings.xml
	packages/SystemUI/res/layout/signal_cluster_view.xml
	packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
	packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java
	services/java/com/android/server/power/ShutdownThread.java

Change-Id: I3c4061a1f6b563c79001659b5b8d4727969a2b29