Merge branch 'jb_mr2' of git://codeaurora.org/platform/packages/apps/Phone into  cm-10.2

Conflicts:
	res/values/strings.xml
	src/com/android/phone/CallNotifier.java
	src/com/android/phone/GsmUmtsAdditionalCallOptions.java
	src/com/android/phone/InCallScreen.java
	src/com/android/phone/InCallTouchUi.java
	src/com/android/phone/MobileNetworkSettings.java
	src/com/android/phone/NotificationMgr.java
	src/com/android/phone/PhoneGlobals.java
	src/com/android/phone/PhoneInterfaceManager.java
	src/com/android/phone/PhoneUtils.java
	src/com/android/phone/Use2GOnlyCheckBoxPreference.java

Change-Id: I7245d5e480c123cae2479abc617bb3a2d1f4253b

Conflicts:

	res/values/config.xml
	src/com/android/phone/InCallScreen.java
	src/com/android/phone/PhoneGlobals.java
	src/com/android/phone/Use2GOnlyCheckBoxPreference.java
	videophone_ims_camera_jni/Android.mk
	videophone_jni/Android.mk
Add compatibility code with mainline's configuration options for unlock

Change-Id: Ife2d6fad5cb1e7c846f5969401ee6dbc881aea3f
Use2GOnlyCheckBoxPreference: fix NPE

Change-Id: Iacedd9f8eefb2d7f8ecdec4c0f1595448edbaf9f