Automatic translation import

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