Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_Stk into kitkat
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_Stk into kitkat
Stk: Move CAF strings

Change-Id: I11f45c66b8d32fc6ead24f700a54a188997a2f88
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_Stk into kitkat
Merge branch 'kitkat' of https://github.com/Nico60/packages_apps_Stk into kitkat