tree 24e56f5da884daf8808448206aee620ec19bdc75
parent a19e9fdebd4230edf3594e7ba298d85f0e87c3c7
parent 8a97e90f9c5024f55570fe44ae59553662061393
author Jeff Sharkey <jsharkey@google.com> 1480711342 +0000
committer android-build-merger <android-build-merger@google.com> 1480711342 +0000

Merge "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 am: f00515f4d9 am: 17d6ba41b8" into nyc-mr1-dev-plus-aosp am: a2a069e998
am: 8a97e90f9c  -s ours

Change-Id: I9ea2fd7893f1db835a2df49c33dbf2b005250a4f