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 am: 00af0a6d2c am: b4c5c522e3

am: 4d1c25ec43  -s ours

Change-Id: I3a65198bb51f19e7b655d1da0a081fafbae066fd
This commit is contained in:
Jeff Sharkey
2017-02-03 00:59:32 +00:00
committed by android-build-merger

Diff Content Not Available