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
Phone: Generic Blacklist support (2 of 5)

Change-Id: I5ff0ef1db2bed4a7c3ebab73aa0476d385f72ec5
Phone: remove old T9 settings preference

Change-Id: I80aa836b8dc29f1edd865913b15246094a2622ee
Phone: ES translations

-Fixed blacklist support

Change-Id: I8677ce68626d1e102acf2efc1486960c6510bdb2
Merge "Phone: ES translations" into cm-10.2