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

Change-Id: I5293c102e810ab50a99e7d20b4b84e03ca7382d2
Automatic translation import

Change-Id: I87bd9f35a011a94ead9a985cd504c078eb8c37dd
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_Torch into kitkat
Merge branch 'kitkat' of https://github.com/Nico60/packages_apps_Torch into kitkat