Dianne Hackborn 3d0724dc22 resolved conflicts for merge of 0e59729b to master ...

Change-Id: I2d3a6bddf66b1df0c101c45ea2fec1cf65caf01b

2011-05-12 15:39:41 -07:00

..

BasePermission.java

…

GrantedPermissions.java

…

Installer.java

Plumbing in PackageManager and installd for multi-user support.

2011-04-15 15:15:27 -07:00

PackageManagerService.java

Use canonical paths to compare library directory with data directory.

2011-05-10 15:32:18 -07:00

PackageSetting.java

…

PackageSettingBase.java

…

PackageSignatures.java

…

PendingPackage.java

…

PreferredActivity.java

…

Settings.java

resolved conflicts for merge of 0e59729b to master

2011-05-12 15:39:41 -07:00

SharedUserSetting.java

…

UserManager.java

Plumbing in PackageManager and installd for multi-user support.

2011-04-15 15:15:27 -07:00