Merge branch 'jellybean' of github.com:ParanoidAndroid/android_packages_apps_Settings into jellybean-legacy
add .75 animation scale

Change-Id: I123608598e1d9aeec0a299e6705810149d67752a
Merge remote-tracking branch 'github/jellybean-legacy' into jellybean-legacy