From: Jeff Sharkey <jsharkey@google.com>
Date: Fri, 3 Feb 2017 00:45:39 +0000 (+0000)
Subject: Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev am: e6be8d765f... 
X-Git-Tag: android-x86-7.1-r1~41^2~1^2~2^2~8
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ee958351b7;p=android-x86%2Fframeworks-base.git

Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev am: e6be8d765f am: 8f4f4daf2c am: 7c0ea478a8 am: 2848738526  -s ours
am: f19cea14cf

Change-Id: I80e9b340be8824005055d2fc9ab9effa49a3e5d2
---

ee958351b7feaa70b04c7689207d57bafa8db094