lol. Lockscreen is missing.
Merge branch 'jellybean' of https://github.com/XYAOSP/packages_apps_Settings into jellybean

Conflicts:
	res/xml/settings_headers.xml