Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e530 am: 5d65931af5 -s ours am: f82c373074

am: 8c9ff68173

Change-Id: Iaa739f638e66376a2aa145a465255f738f9b3f1b
This commit is contained in:
Jeff Sharkey
2017-02-03 00:40:52 +00:00
committed by android-build-merger

Diff Content Not Available