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

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
Automatic translation import

Change-Id: Id7ee38898a0ecbbc2265b2f46427dfa5235b6ce5
Merge branch 'cm-11.0' of git://github.com/CyanogenMod/android_packages_apps_Email into cm-11.0
Merge branch 'cm-11.0' of https://github.com/temasek/android_packages_apps_Email into HEAD