Cleanup

Conflicts:
	core/java/android/provider/Settings.java
merge conflicts