Automatic translation import

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