add Application Package to app info (chirayudesai@cyanogenmod.org)
Merge branch 'jb-mr1' into HEAD
settings: Privacy Guard support

 * Add toggle to InstalledAppDetails to enable/disable privacy guard flag on
   a per-application basis.
 * Add toggle to enable privacy guard by default for applications.

Change-Id: If03aa5319c520b6c4a78887f0f46ef1443ddaa83

Conflicts:
	res/layout/installed_app_details.xml
	res/values/cm_strings.xml
	src/com/android/settings/SecuritySettings.java
	src/com/android/settings/applications/InstalledAppDetails.java
get Privacy settings to work on Xenon (1/2)
Merge branch 'new' into jb-mr1
Merge pull request #4 from pcarenza/jb-mr1

add Application Package to app info (chirayudesai@cyanogenmod.org)