Merge tag 'android-4.3_r2.1' into cm-10.2

Android 4.3 release 2.1

Conflicts:
	res/values-el/strings.xml
	res/values-iw/strings.xml
	res/values-zh-rCN/strings.xml
	res/values/config.xml
	res/values/strings.xml
	res/xml/network_setting.xml
	src/com/android/phone/CallFeaturesSetting.java
	src/com/android/phone/CallNotifier.java
	src/com/android/phone/MobileNetworkSettings.java
	src/com/android/phone/NotificationMgr.java
	src/com/android/phone/Use2GOnlyCheckBoxPreference.java

Change-Id: Iffe1bba52adb1135326ccea652c1ccd64696ba05
Merge branch 'cm-10.2' of git://github.com/CyanogenMod/android_packages_apps_Phone into HEAD

Conflicts:
	src/com/android/phone/MobileNetworkSettings.java

Change-Id: Ibcab4cf9427f2fd3a15306338780301134e45df6