Automatic translation import

Change-Id: I63b25e96baba32ce037a09bb052e65b48ab5d27f
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