OSDN Git Service

am b7394671: Merge "Work on issue #22303510: Additional permissions aren\'t properly...
authorDianne Hackborn <hackbod@google.com>
Wed, 22 Jul 2015 20:24:30 +0000 (20:24 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 22 Jul 2015 20:24:30 +0000 (20:24 +0000)
commit863504111546fb46fcb5af356efb267c8582018a
treee46632028b0b7d5215604a5f15194ac47cb194cb
parent568e67a322deb027480fb85e6d4082b78d907d57
parentb73946715cb9e3ca7a2702407e34f885e92a5d9a
am b7394671: Merge "Work on issue #22303510: Additional permissions aren\'t properly..." into mnc-dev

* commit 'b73946715cb9e3ca7a2702407e34f885e92a5d9a':
  Work on issue #22303510: Additional permissions aren't properly...
services/core/java/com/android/server/pm/PackageManagerService.java
services/core/java/com/android/server/pm/Settings.java