duplice strings
Merge github.com:ResurrectionRemix/android_packages_services_Telephony into kitkat1

Conflicts:
	res/values/custom_strings.xml