tree c4d1d6c35effb6c5d4474d0f2066640d1b046fc5
parent c46a3b0dc502a3cab8e9e56f245e2d4e06cf6002
parent 01f9f1bec2ac5c79895535105e777cae135c65da
author Jeff Sharkey <jsharkey@google.com> 1480706160 +0000
committer android-build-merger <android-build-merger@google.com> 1480706160 +0000

Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev am: fdef2cd87d am: 414334595e am: 26e6918800 am: ef5d241938 am: 29c335ef2e
am: 01f9f1bec2  -s ours

Change-Id: I2cb165fab892f3206fbdf03a14796ea721c2a2a8