Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_Email into HEAD

Conflicts:
	res/values-az-rAZ/strings.xml
	res/values-az/strings.xml
	res/values-hy/strings.xml
	res/values-ka/strings.xml
	res/values-km/strings.xml
	res/values-lo/strings.xml
	res/values-mn/strings.xml
	res/values-ne-rNP/strings.xml
	res/values-ne/strings.xml
	res/values-si-rLK/strings.xml
	res/values-si/strings.xml

Change-Id: I91a814f19e4bbe24425fadb414228fe6ed14d61e