Move halo blacklist box to the button
	modified:   res/layout/blacklist_dialog.xml
	modified:   res/layout/installed_app_details.xml
	modified:   res/values/liquid_strings.xml
	modified:   src/com/android/settings/applications/InstalledAppDetails.java

Conflicts:
	src/com/android/settings/applications/InstalledAppDetails.java