Automatic translation import

Change-Id: Id070945e978094e889c701758b30d12299df8420
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_Torch into cm-11.0
Automatic translation import

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