tree 868dbddc06eb8e39d2351e7c629a6b7d74dbc1e0
parent 26450476b8340200dca91386bc97e39995296709
parent 9e7bd59457c973a297f7d32847cb7d064fced1e8
author Jeff Sharkey <jsharkey@android.com> 1480704836 +0000
committer android-build-merger <android-build-merger@google.com> 1480704836 +0000

DO NOT MERGE: Check provider access for content changes. am: 11e3e52bd9 am: bdfb26ac3b am: ad04786a3d
am: 9e7bd59457

Change-Id: I83f64b1e31c1d598a1db53af45cbf2563b3eae57