Automatic translation import

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