OSDN Git Service

Merge "Take into account default app for default grants"
authorSvetoslav Ganov <svetoslavganov@google.com>
Fri, 6 Nov 2015 00:40:48 +0000 (00:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 6 Nov 2015 00:40:48 +0000 (00:40 +0000)
commit57fb4bd4f704c93ff73e055e6602ee18f7dbf669
tree32363e11c79971dfb124eddf302c93469c394556
parent0c4ce4474ff0020b2b041f26fb00efbdc0783285
parent7abb36599d9537296d9a51f766152025c6ed0491
Merge "Take into account default app for default grants"
am: 7abb36599d

* commit '7abb36599d9537296d9a51f766152025c6ed0491':
  Take into account default app for default grants
services/core/java/com/android/server/pm/DefaultPermissionGrantPolicy.java