tree 76f77fc6e31dd62549c102d7cfa7d0111d0b386b
parent 8905569c674df7cd0546029d3b5b836e525fce7f
parent fd55f834c804f239bd0f8b0683e9bfee18550442
author Alex Naidis <alex.naidis@linux.com> 1483753454 +0000
committer android-build-merger <android-build-merger@google.com> 1483753454 +0000

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

Change-Id: Ia53faad0ba004233d0ee031e1ca83d705f5bd379