Automatic translation import

Change-Id: I4fbc381ef59732b003836c8127960ad1ac128518
Automatic translation import

Change-Id: I70c03ba89e9754c7e0bf9a2a157922d92e7942dd
Merge pull request #6 from CyanogenMod/cm-11.0

upstream