From: Jeff Sharkey <jsharkey@android.com>
Date: Fri, 3 Feb 2017 01:30:01 +0000 (+0000)
Subject: DO NOT MERGE. No direct Uri grants from system. am: 2dfdf662d0  -s ours am: 4a4b6bfaf... 
X-Git-Tag: android-x86-7.1-r1~96
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=87ae27b020abe7245d89d961134246572658f769;p=android-x86%2Fframeworks-base.git

DO NOT MERGE. No direct Uri grants from system. am: 2dfdf662d0  -s ours am: 4a4b6bfafb am: 61e9179646  -s ours am: 9346bec730 am: c0cc8695a5 am: f51e8e8642 am: bf16fab4e7  -s ours am: 65b0a6f596 am: 6f47221263 am: 47bfa0ab25
am: 6cfa84791d

Change-Id: Idd62b3a72d5f8daf403100c6a6150b5792c00de7
---

87ae27b020abe7245d89d961134246572658f769