From: Jeff Sharkey <jsharkey@google.com>
Date: Fri, 2 Dec 2016 22:26:03 +0000 (+0000)
Subject: Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev... 
X-Git-Tag: android-x86-8.1-r1~2121^2~1540
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=cd57f1d53b;p=android-x86%2Fframeworks-base.git

Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev am: 6b89229d14 am: a7efe16fe1  -s ours am: f1085f2dc8 am: c130d7fd5e am: 948841362a am: 7e54dc58d4  -s ours am: 3fa188bd8f am: 09960bdfcc am: d12e48494d am: 341813c852
am: 375f16eff4

Change-Id: Ia7400dc5280a87cfa687c0b84b124bdb8db6381d
---

cd57f1d53bd92069b1a6c33acb00e5ba7dfaa3a9