Change class

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

Change-Id: I6124d0e987e7417e56d277422be708c59900f636