Automatic translation import

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