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

Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev am: 7115ad7119 am: fa22018223 am: 8469d52d41  -s ours am: f68199a472 am: a7388f1ed4
am: 7a6bd686a3

Change-Id: I30d3bad3c7c6e6779d5c2b964ae4aa5b68b82bbd
---

1e9b978dc794d5bb1adeb40ab0fb93ba4113b745