Dianne Hackborn c32e190ea6 resolved conflicts for merge of a9c38461 to master ...

Change-Id: Ie7044c4f9f15384c3edd328fa8e2932c731d9d5c

2012-06-29 16:23:49 -07:00

..

BasePermission.java

…

GrantedPermissions.java

…

Installer.java

Fix issue #6295373: "Package com.google.android.apps.authenticator2 has...

2012-06-07 16:57:57 -07:00

PackageManagerService.java

resolved conflicts for merge of a9c38461 to master

2012-06-29 16:23:49 -07:00

PackageSetting.java

…

PackageSettingBase.java

…

PackageSignatures.java

…

PackageVerificationResponse.java

…

PackageVerificationState.java

…

PendingPackage.java

…

PreferredActivity.java

…

Settings.java

am c17f92ce: Merge "Use removePackageLI instead of removing mPackages" into jb-dev

2012-06-26 10:36:54 -07:00

SharedUserSetting.java

…

UserManager.java

Add an icon to the user information.

2012-06-12 18:18:29 -07:00