Automatic translation import

Change-Id: Ia89cd86171e4436ec8c9c1cb9598b7571a14280b
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_Torch into cm-11.0
Merge branch 'cm-11.0' of https://github.com/temasek/android_packages_apps_Torch into HEAD