Patch::com.android.settings
Conflicts:
	src/com/android/settings/carbon/RibbonTargets.java