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

am: d20b04a41d  -s ours

Change-Id: I2a98850d4c3246c02d5197adff9503be2839df01
This commit is contained in:
Jeff Sharkey
2017-02-03 00:30:04 +00:00
committed by android-build-merger

Diff Content Not Available