Automatic translation import

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