Automatic translation import

Change-Id: Ibeae48ae434f281784fc37c34af568b17e0d6777
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0

Conflicts:
	res/values-zh-rHK/cm_strings.xml

Change-Id: Idb8acb91e6b9e9b211f2b57419da2101bc289550
Merge https://github.com/cristianomatos/android_packages_services_Telephony into HEAD