OSDN Git Service

am 81f3a85a: Merge "Fix issue #22940169: "pm grant" can no longer grant permissions...
authorDianne Hackborn <hackbod@google.com>
Fri, 14 Aug 2015 17:15:33 +0000 (17:15 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 Aug 2015 17:15:33 +0000 (17:15 +0000)
* commit '81f3a85aa29d83ed1a5de4de1006587d375a1c77':
  Fix issue #22940169: "pm grant" can no longer grant permissions...

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