dim, actual settings

Change-Id: I3d96eceeebdadc7d0621725eba49975ceb3e0e8e

Conflicts:

	core/java/android/provider/Settings.java