Merge branch 'cm-10.2' of git://github.com/CyanogenMod/android_packages_apps_Settings into cm-10.2
Merge branch 'cm-10.2' of git://github.com/CyanogenMod/android_packages_apps_Settings into cm-10.2
Merge branch 'cm-10.2' of git://github.com/CyanogenMod/android_packages_apps_Settings into cm-10.2
Merge branch 'cm-10.2' of git://github.com/CyanogenMod/android_packages_apps_Settings into cm-10.2
Merge branch 'cm-10.2' of git://github.com/CyanogenMod/android_packages_apps_Settings into cm-10.2
Merge branch 'cm-10.2' of git://github.com/CyanogenMod/android_packages_apps_Settings into cm-10.2

Conflicts:
	res/values-fi/cm_strings.xml
Merge branch 'cm-10.2' of git://github.com/CyanogenMod/android_packages_apps_Settings into cm-10.2
Merge branch 'cm-10.2' of git://github.com/CyanogenMod/android_packages_apps_Settings into cm-10.2
Merge branch 'cm-10.2' of git://github.com/CyanogenMod/android_packages_apps_Settings into cm-10.2
Merge branch 'cm-10.2' of git://github.com/CyanogenMod/android_packages_apps_Settings into cm-10.2
updated activity links
Merge branch 'cm-10.2' of git://github.com/CyanogenMod/android_packages_apps_Settings into cm-10.2
Merge branch 'cm-10.2' of git://github.com/CyanogenMod/android_packages_apps_Settings into cm-10.2
Merge branch 'cm-10.2' of git://github.com/CyanogenMod/android_packages_apps_Settings into cm-10.2
Merge branch 'cm-10.2' of git://github.com/CyanogenMod/android_packages_apps_Settings into cm-10.2
Merge branch 'cm-10.2' of git://github.com/CyanogenMod/android_packages_apps_Settings into cm-10.2
Merge branch 'cm-10.2' of git://github.com/CyanogenMod/android_packages_apps_Settings into cm-10.2
Merge branch 'cm-10.2' of git://github.com/CyanogenMod/android_packages_apps_Settings into cm-10.2
Merge branch 'cm-10.2' of git://github.com/CyanogenMod/android_packages_apps_Settings into cm-10.2
Merge branch 'cm-10.2' of git://github.com/CyanogenMod/android_packages_apps_Settings into cm-10.2