tree 8436915100ab06a84ce175c1f41b9d17e34ab2c7
parent 8a97e90f9c5024f55570fe44ae59553662061393
parent 0e673a814396a76558fab5c153292568d1884d70
author Jeff Sharkey <jsharkey@google.com> 1480708867 +0000
committer android-build-merger <android-build-merger@google.com> 1480708867 +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" into cw-f-dev am: 2e73db5b9c
am: 0e673a8143

Change-Id: Ia4b77f2c50c89ac555880acf28eea28f8bc355a3