Forget what this was
Signed-off-by: scott <scott@ubuntu.com>

Change-Id: I7484934b3c04eb8d4d1a719ce4ab7cf081001ad3
Revert "Make it possible to hangup and dialback from IncallScreen"

This reverts commit e4b2be001db40fa5b9f5b35289c19151e14c3af8.

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

Conflicts:
	res/values/strings.xml

Change-Id: Id0d50bc6e7bb899f6af380cfa98cce5a99910c85
Merge branch 'qcril' into cm-10.2

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

Conflicts:
	res/values/strings.xml
	src/com/android/phone/InCallTouchUi.java

Change-Id: I5f81babb834db7c70e242600546500081514f5de
Use2GOnlyCheckBoxPreference: fix NPE

Change-Id: Iacedd9f8eefb2d7f8ecdec4c0f1595448edbaf9f