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

Change-Id: I8330da471c2770612f2898339f567b05853a2479
This commit is contained in:
Jeff Sharkey
2017-02-03 00:57:39 +00:00
committed by android-build-merger

Diff Content Not Available