Merge branch 'kk' of github.com:TeamTREX/android_packages_apps_Settings into kk