DO NOT MERGE. No direct Uri grants from system. am: b61338ecb3 am: 30a4388481 am: 190511955f

am: 8fa9048477  -s ours

Change-Id: Ia27d7b8170386df35a895c917d235bdd312827ca
This commit is contained in:
Jeff Sharkey
2017-02-03 00:53:36 +00:00
committed by android-build-merger

Diff Content Not Available