Fix derp

Change-Id: Ic1ec7b4cca82a52db0f874d855a3b61c7b6e7348
Smaller trigger area

Change-Id: I11c6d5bbda19e229f8f6c5ed8f169bb7f8593b72
Merge branch 'jellybean' of https://github.com/ParanoidAndroid/android_packages_apps_Settings into jellybean

Conflicts:
	res/values/strings.xml

Change-Id: I73d8a2130d04033670e2db9c89c31a5c39f2bf68
Merge remote-tracking branch 'upstream/jellybean' into HEAD