Settings: :3
Merge branch 'kk' of github.com:PixelROM/packages_apps_Settings into HEAD