We need this

Conflicts:

	core/java/android/provider/Settings.java