Merge branch 'jellybean' of https://github.com/ParanoidAndroid/android_packages_apps_Settings into jellybean-legacy

Conflicts:
	res/values/strings.xml

Change-Id: I4c22cfdb6f4b9ad834c0f9c0c14a7157fb47a7ea