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