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

…

PackageManagerService.java

…

PackageSetting.java

…

PackageSettingBase.java

…

PackageSignatures.java

…

PendingPackage.java

…

PreferredActivity.java

…

Settings.java

…

SharedUserSetting.java

…

UserManager.java

…