Fix derp

Change-Id: Ic1ec7b4cca82a52db0f874d855a3b61c7b6e7348
Merge branch 'jellybean' of git://github.com/ParanoidAndroid/android_packages_apps_Settings into pa-cm-10.1