perms
Merge branch 'cm-10.1' of https://github.com/PAC-man/android_packages_apps_Settings into cm-10.1
sdf
Merge branch 'cm-10.1' of https://github.com/PAC-man/android_packages_apps_Settings into cm-10.1
Merge branch 'cm-10.1' of https://github.com/PAC-man/android_packages_apps_Settings into cm-10.1
merge latest
Merge branch 'cm-10.1' of https://github.com/PAC-man/android_packages_apps_Settings into cm-10.1
Merge branch 'cm-10.1' of https://github.com/PAC-man/android_packages_apps_Settings into cm-10.1
Merge branch 'cm-10.1' of https://github.com/PAC-man/android_packages_apps_Settings into cm-10.1
update
Merge branch 'cm-10.1' of https://github.com/PAC-man/android_packages_apps_Settings into cm-10.1
Merge branch 'cm-10.1' of https://github.com/PAC-man/android_packages_apps_Settings into cm-10.1
Fix Wimax MAC Address in About Section