tree aef533a7423ca0fa4e494d170e0b5556ae831606
parent 3e16dbcf3188ce5876211a613d351fcb63307afa
parent 70ed66ce6c236303d4784f768a73fb512e8ae902
author Jeff Sharkey <jsharkey@google.com> 1486087187 +0000
committer android-build-merger <android-build-merger@google.com> 1486087187 +0000

Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-dev am: 0354b89d31 am: 5536402f6d am: 6db504c6f6 am: 609145c315 am: af86efd70d
am: 70ed66ce6c  -s ours

Change-Id: Ib02e9c3b13fb600d3a6e36091e36762d9de511a6