HALO (2/2)

Change-Id: I7de6a9157415fe05b0a59d8260e33cc1527a342d

Conflicts:
	AndroidManifest.xml
	res/layout/installed_app_details.xml
	res/values/pa_strings.xml
	res/xml/settings_headers.xml
	src/com/android/settings/applications/InstalledAppDetails.java