kill this
Merge branch 'jb-mr1' of github.com:espmartin/packages_apps_Settings into jb-mr1

Conflicts:
	res/xml/lockscreen_settings.xml