tree 868dbddc06eb8e39d2351e7c629a6b7d74dbc1e0
parent dd09c12a614749256372d2ffa2cce57a3597a06c
parent a75ce3a705f415bf6cde39c2a59d004c1a5f4e74
author Jeff Sharkey <jsharkey@google.com> 1480707865 +0000
committer android-build-merger <android-build-merger@google.com> 1480707865 +0000

Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfce4 am: 471812ad04 am: 4610805746  -s ours am: aeeb9c8470 am: 8c74832d5e am: 07ad2a9063
am: a75ce3a705

Change-Id: Ic4004d4923cc544a4babc457bc5cdb024bc9ee51