tree 24e56f5da884daf8808448206aee620ec19bdc75
parent 8a8ced9f77f3c0fcbd5a9e345d05f94c11b3c5bc
parent 57c8b867c4aa6ba504efd9161f2947562c93f49a
author Jeff Sharkey <jsharkey@android.com> 1480712379 +0000
committer android-build-merger <android-build-merger@google.com> 1480712379 +0000

DO NOT MERGE. Check provider access for content changes. am: 91add43ae7 am: 792d49dfb5  -s ours am: 32af84320b am: 8b5fa0c0c0 am: d081cb0ab7 am: cd35e746dc  -s ours am: 836b54e6bb am: 383e0cfa06 am: a55258bd17 am: 2f48a6ce63 am: 90055d575c
am: 57c8b867c4  -s ours

Change-Id: Ib6d5a414d0b58db436c1b8344d1fd0ef9bd5f766