fix build

Conflicts:
	src/com/android/settings/cyanogenmod/SystemSettings.java