tree 368af5b5909ce75a6b2ad43cfbe1b5a2cc2bdaa8
parent 2848738526e0ba2de039a467bcd51dd417583fef
parent 1ddaf2f96bb527c2a48cbc88ae0a42ac75e85cb4
author Jeff Sharkey <jsharkey@android.com> 1486082921 +0000
committer android-build-merger <android-build-merger@google.com> 1486082921 +0000

DO NOT MERGE. No direct Uri grants from system. am: 6f13f73b73 am: 73f95823f8  -s ours am: 05749525a5 am: bd2bec9164
am: 1ddaf2f96b

Change-Id: I06a6d16b17cd5611247a442c2e7fa7b7b21134cf