Merge branch 'NamelessROM/android-4.4'
(2/2)

Change-Id: I2bdfc346815115bb19ba469a61ccca9ae4e036dd

Conflicts:
	res/values/cm_strings.xml
	res/values/config.xml
	res/values/custom_arrays.xml
	res/values/custom_strings.xml
	res/xml/call_feature_setting.xml
	res/xml/network_setting.xml
	src/com/android/phone/CallFeaturesSetting.java
	src/com/android/phone/CallNotifier.java
	src/com/android/phone/ClearMissedCallsService.java
	src/com/android/phone/GsmUmtsAdditionalCallOptions.java
	src/com/android/phone/MSISDNEditPreference.java
	src/com/android/phone/MobileNetworkSettings.java
	src/com/android/phone/MyPhoneNumber.java
	src/com/android/phone/NotificationMgr.java
	src/com/android/phone/PhoneGlobals.java
	src/com/android/phone/PhoneInterfaceManager.java
	src/com/android/phone/Ringer.java