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

DO NOT MERGE. No direct Uri grants from system.
am: bac46f5b65

Change-Id: I87dbe96e14c68b5d99b43bf7ad3d653d5fb33a61
---

3da69c1115a7ba8826fe4d74e73d0f0d6c2c5861