fix
delete unneeded classes
string edit
Merge branch 'lollipop' of https://github.com/ProjectDISCO/android_packages_apps_Settings into caf