Automatic translation import

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