Merge branch 'jb43' of https://github.com/ParanoidAndroid/android_packages_apps_Settings into jb43-legacy
Merge branch 'original/jb43-legacy'
Merge branch 'original/jb43'
Merge branch 'original/jb43-legacy'
Merge branch 'original/jb43-legacy'
Merge branch 'original/jb43'
Merge remote-tracking branch 'upstream/jb43-legacy' into jb43-legacy