Kenny Root a51b6fd6f8 resolved conflicts for merge of b2d0ee16 to master ...

Change-Id: I4483a6d0ccecfea4a1e66bb6eba80d13e8b9a3a4

2011-05-19 15:02:18 -07:00

..

BasePermission.java

…

GrantedPermissions.java

…

Installer.java

…

PackageManagerService.java

resolved conflicts for merge of b2d0ee16 to master

2011-05-19 15:02:18 -07:00

PackageSetting.java

…

PackageSettingBase.java

…

PackageSignatures.java

…

PendingPackage.java

…

PreferredActivity.java

…

Settings.java

…

SharedUserSetting.java

…

UserManager.java

…