Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am: 3e4faac39f -s ours am: b058dc139d am: d20b04a41d -s ours

am: 4b0164b27c

Change-Id: I4dda89507d1003f82af6e204c9983732b36927da
This commit is contained in:
Jeff Sharkey
2017-02-03 00:35:19 +00:00
committed by android-build-merger

Diff Content Not Available