DO NOT MERGE. No direct Uri grants from system. am: b61338ecb3 am: 30a4388481 am: 825a242ea9

am: 42dbff71a1  -s ours

Change-Id: I30ca63aef3e30b65de91aff0f48904d9c8b75617
This commit is contained in:
Jeff Sharkey
2017-02-03 01:52:49 +00:00
committed by android-build-merger

Diff Content Not Available