Automatic translation import

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