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

Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-mr1-dev am: 6b8ae05e36 am: 806307106b am: 6529292783
am: 579dd3b014  -s ours

Change-Id: I521a26e52905983a855217aa8e3d0f9b68fe2d44
---

db8102a98fc86d4cd6e8ea58bf72763dde6f1285