Merge branch 'kitkat' of github.com:AOKP/packages_apps_ROMControl into
kitkat