OSDN Git Service

resolved conflicts for f005d55f to master
authorJeff Hao <jeffhao@google.com>
Thu, 24 Sep 2015 18:26:48 +0000 (11:26 -0700)
committerJeff Hao <jeffhao@google.com>
Thu, 24 Sep 2015 18:26:48 +0000 (11:26 -0700)
Change-Id: I82027116a2b0bfc8b1ff1e20c3a115a1ba8a19db

1  2 
services/core/java/com/android/server/pm/PackageManagerService.java