HALO (2/2)

Conflicts:
	res/layout/installed_app_details.xml
	src/com/android/settings/applications/InstalledAppDetails.java