Automatic translation import

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