tree 00f81f074c4fc57d6dfde54ebc18a3dc27b5e140
parent de02369ab96453ed84bfac13b94be384be6aa6c7
parent ce15555148eb0868dda2cc3db597a3818199e119
author Jeff Sharkey <jsharkey@google.com> 1486085751 +0000
committer android-build-merger <android-build-merger@google.com> 1486085751 +0000

Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e530 am: 5d65931af5  -s ours am: f82c373074 am: 8c9ff68173 am: 4b3c59005b am: 394357761e  -s ours am: bafa3c1d3b am: 7cd3c47c29 am: 770eff87cd
am: ce15555148

Change-Id: I3f313eea586334158e710ca4a6545127e7fa8855