tree 0fc888e60d084ac7edcf21c99866fcfe7fbb83ea
parent 26e69188002afba3a5a357e9c5d11906dfd01acc
parent b88d8dc58f25882322291f3cb4a3c4d8a680951c
author Jeff Sharkey <jsharkey@android.com> 1480704330 +0000
committer android-build-merger <android-build-merger@google.com> 1480704330 +0000

DO NOT MERGE: Check provider access for content changes. am: 956bc433dc  -s ours am: 3f0e7465cb
am: b88d8dc58f

Change-Id: I9587d5abd8d0525e3b098a5f9662e5edbc1f9c12