From: Jeff Sharkey <jsharkey@google.com>
Date: Fri, 3 Feb 2017 01:55:01 +0000 (+0000)
Subject: Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e5... 
X-Git-Tag: android-x86-8.1-r1~4346
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=152071c954bd59e69bd291a257d0b8260dd5724d;p=android-x86%2Fframeworks-base.git

Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e530 am: 5d65931af5  -s ours am: f82c373074 am: 8c9ff68173 am: 4b3c59005b am: 394357761e  -s ours am: bafa3c1d3b am: 7cd3c47c29 am: 770eff87cd am: ce15555148 am: 0792846ea5
am: 04bfaf9749  -s ours

Change-Id: I601910b6d9b563ad95c40a7c45bdc618c469cca8
---

152071c954bd59e69bd291a257d0b8260dd5724d