From: Jeff Sharkey <jsharkey@google.com>
Date: Fri, 2 Dec 2016 19:21:21 +0000 (+0000)
Subject: Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am... 
X-Git-Tag: android-x86-7.1-r1~66^2~15^2~21
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f00515f4d9;p=android-x86%2Fframeworks-base.git

Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836  -s ours am: 99b97e5ed1
am: 398cdb6929

Change-Id: I40a0cb7f416d843b12893656d16dfed97d0df058
---

f00515f4d935190b716c4a1bc18a489ddd5d8de8