tree 8436915100ab06a84ce175c1f41b9d17e34ab2c7
parent a5b6631392e3ea5cc2edad4bd09bf0474fb16ec1
parent 2bfad25b06773d33d280c23842eaafd46b4ba34d
author Jeff Sharkey <jsharkey@android.com> 1480708602 +0000
committer android-build-merger <android-build-merger@google.com> 1480708602 +0000

Merge "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" into nyc-mr1-dev-plus-aosp
am: 2bfad25b06

Change-Id: I3945f337de1d941779a5f5018a86c87ca494bc9e