tree 868dbddc06eb8e39d2351e7c629a6b7d74dbc1e0
parent 9ce28af49c2d1b780eca26c562bce42d0a1497f5
parent 2e73db5b9ccee1cca2c7b486442bae72f46e95d2
author Jeff Sharkey <jsharkey@google.com> 1480708281 +0000
committer android-build-merger <android-build-merger@google.com> 1480708281 +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

Change-Id: I0d230d279eb3fad10e46dbb3c469d770a80482e8