Merge remote-tracking branch 'aokp/jb-mr2' into jb-mr2

Conflicts:
	res/layout/incall_touch_ui.xml
	res/values-cs/strings.xml
	res/values-hu/strings.xml
	res/values-ja/strings.xml
	res/values-sk/strings.xml
	res/values-zh-rCN/strings.xml
	res/values/config.xml
	res/values/strings.xml
	res/xml/call_feature_setting.xml
	src/com/android/phone/CallFeaturesSetting.java
	src/com/android/phone/CallNotifier.java
	src/com/android/phone/InCallTouchUi.java
	src/com/android/phone/NotificationMgr.java
	src/com/android/phone/PhoneGlobals.java
	src/com/android/phone/PhoneUtils.java
	src/com/android/phone/Ringer.java
	src/com/android/phone/Use2GOnlyCheckBoxPreference.java

Change-Id: I866eb7fddc7ba409bec23a4fb361dce5bb6e38d8