Automatic translation import

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