Automatic translation import

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