OSDN Git Service

resolved conflicts for merge of 37651b60 to lmp-dev-plus-aosp
authorAlex Light <allight@google.com>
Tue, 5 Aug 2014 21:25:43 +0000 (14:25 -0700)
committerBrian Carlstrom <bdc@google.com>
Thu, 7 Aug 2014 05:25:00 +0000 (22:25 -0700)
commita25dc2bbe70b7449dc57e9619778ba592c198003
treef497fe5905be0a10103c77590068e888db0af688
parent7bbf9e720d12c06c46c468f18848b37d61bcaf28
resolved conflicts for merge of 37651b60 to lmp-dev-plus-aosp

Change-Id: I1fe0e64d2069b7424014bd3ff0bf6f80b439220d
(cherry picked from commit 1faf2d0d25550dc759481fd523456711808e8251)
services/core/java/com/android/server/pm/Installer.java
services/core/java/com/android/server/pm/PackageManagerService.java