hata

Conflicts:

	src/com/android/settings/DisplaySettings.java