trds

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

Conflicts:
	core/java/android/provider/Settings.java
	services/java/com/android/server/UiModeManagerService.java