Automatic translation import

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