Another fix

Conflicts:

	core/java/android/provider/Settings.java