Merge branch 'qcril' into cm-10.2

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

Conflicts:
	core/res/res/values/strings.xml
	core/res/res/values/symbols.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
	telephony/java/android/telephony/TelephonyManager.java
	telephony/java/com/android/internal/telephony/RILConstants.java

Change-Id: I72b6183a2a549e151f250e13b9f89260eeefcc18
NetworkController: Hide signal strength icon when no SIM icon is shown

Change-Id: I5c4b43bba1469e14474d20a3627eafa597459e6e
QCFace: Fix package path

Change-Id: I8282331003d0494bd5620cfb6e91f2dcfa708d30
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Support GESTURE_SENSOR input device type with GestureService

* The GESTURE_SENSOR input device type is meant to support touch sensors
  which are meant for gesture input only, very similar to a touchpad,
  but without the pointer capability.
* Define separate service to handle gestures from GESTURE_SENSOR device
  type.

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

Conflicts:
	Android.mk
	core/res/res/values/symbols.xml
	services/java/com/android/server/SystemServer.java
Hide InputDevice.SOURCE_GESTURE_SENSOR from API

Change-Id: If009e9595fc593594b0e7764669996de137483a1
telephony: disable the use of SMS_EXPECT_MORE by default (1/2)

CodeAurora added the use of the RIL_REQUEST_SEND_SMS_EXPECT_MORE API
which is not supported by every RIL. Disabled it by default to reflect
AOSP behavior and added a flag to enable it.

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

Conflicts:
	core/res/res/values/config.xml
	core/res/res/values/symbols.xml
update inputmanager for gesture service
Signed-off-by: scott <scott@ubuntu.com>

Change-Id: I8368e0e47e701e321595f1b106e8e1d2e5216223
fix phonestatusbar from previous telephony merges
Signed-off-by: scott <scott@ubuntu.com>

Change-Id: I99ca4d2565681158af3a4ef64c6a1ed324910e46