tree e737ee21fc86e4672a660b4d3f32ac42e57c99a7
parent 414334595e8d705c6fbb9ab348491c756ed1ebfd
parent 3f0e7465cb530a1f59a8b8082c6b2e15db7ff8da
author Jeff Sharkey <jsharkey@android.com> 1480703803 +0000
committer android-build-merger <android-build-merger@google.com> 1480703803 +0000

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

Change-Id: Iaa85b6d22c436ff2c46eafe500a74448403c5886