tree 77c2f8b51f27d5ffae84286be96d7f14ef608969
parent afdf387e13d6588183cb9a4271e7688562a35508
parent 80888cdcbed7d9445fefb3f47a813516a10a6b17
author Alex Naidis <alex.naidis@linux.com> 1483753699 +0000
committer android-build-merger <android-build-merger@google.com> 1483753699 +0000

Merge "DefaultPermissionGrantPolicy: Pass correct arguments" am: 0b325c6634 am: fd55f834c8
am: 80888cdcbe

Change-Id: I9852107278f6206582393a57be60074763a6cb81