Brian Carlstrom 22abe3829b resolved conflicts for merge of 9af19bee to klp-dev-plus-aosp ...

Change-Id: I70f34a6523fb43129cfe7d4c7308bc3b7353f57c

2014-03-13 16:10:32 -07:00

..

BasePermission.java

…

GrantedPermissions.java

…

Installer.java

ART profiler usage.

2014-03-07 12:32:44 -08:00

KeySetManager.java

…

PackageKeySetData.java

…

PackageManagerService.java

resolved conflicts for merge of 9af19bee to klp-dev-plus-aosp

2014-03-13 16:10:32 -07:00

PackageSetting.java

Fix priv-app edge case across OTAs

2013-10-18 18:11:05 -07:00

PackageSettingBase.java

…

PackageSignatures.java

…

PackageVerificationResponse.java

…

PackageVerificationState.java

…

PendingPackage.java

…

PreferredActivity.java

Work on issue #10759595: preferred tag doesn't prevent...

2013-09-23 11:08:52 -07:00

PreferredIntentResolver.java

…

SELinuxMMAC.java

Augment SELinuxMMAC functionality.

2013-12-06 08:51:20 -05:00

Settings.java

am 5e578e17: am 40a26004: Issue #13308712: Add --checkin to package manager dump.

2014-03-05 23:11:07 +00:00

SharedUserSetting.java

…

UserManagerService.java

Don't remove restrictions files that are valid

2013-09-26 13:20:17 -07:00