Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr1.5-dev

am: 1f007d1471  -s ours

Change-Id: I5fb0f4d1ebf169c8e1309c1d7549d34b362c8328
This commit is contained in:
Jeff Sharkey
2017-02-03 00:12:31 +00:00
committed by android-build-merger

Diff Content Not Available