tree 24e56f5da884daf8808448206aee620ec19bdc75
parent 01f73e09f5d75308d17ad7fccb44ad381f04bcd6
parent 7d72a117ef200e226a29c41d476dbd5dd899d514
author Jeff Sharkey <jsharkey@android.com> 1480710331 +0000
committer android-build-merger <android-build-merger@google.com> 1480710331 +0000

DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b5 am: 74b36307a0 am: 4ad177829a  -s ours am: c067e76bba am: 0891ca2fad am: 12b2f8a275 am: 71e4281969 am: d01f22d0b2
am: 7d72a117ef  -s ours

Change-Id: Ia0853bd47bfaa1d76ffbe1f952aeaf09c238cf6a