Pie controls
Merge branch 'jellybean' of git://github.com/ParanoidAndroid/android_packages_apps_Settings into jellybean