From: Jeff Sharkey <jsharkey@android.com>
Date: Fri, 3 Feb 2017 00:18:38 +0000 (+0000)
Subject: DO NOT MERGE. No direct Uri grants from system. am: b61338ecb3
X-Git-Tag: android-x86-7.1-r1~108
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=190511955fe388988bda3209981120820943e075;p=android-x86%2Fframeworks-base.git

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

Change-Id: I5088038dbd457b7d2314a014da11ebd14192a211
---

190511955fe388988bda3209981120820943e075