Merge "DO NOT MERGE. No direct Uri grants from system. am: 3e2652a55d am: d819c2386b am: e79d2be2fe am: e25ab62f5b am: cc17b28c0c" into nyc-mr2-dev-plus-aosp

am: 6328cc234a  -s ours

Change-Id: I7608c1071c08ff822419f5cc2427b8fcb2b52e5f
This commit is contained in:
Jeff Sharkey
2017-02-03 01:56:46 +00:00
committed by android-build-merger

Diff Content Not Available