tree 2f0a5321fecbafeb0af99b0b145057f252797027
parent a761210607fcaeeaf85738ca15165c91a564d3eb
parent 7358e7bcdfdf889b80f84708ef26f73037b1f538
author Jeff Sharkey <jsharkey@google.com> 1480719225 +0000
committer android-build-merger <android-build-merger@google.com> 1480719225 +0000

Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev am: ae7d4b1339  -s ours am: ce477912a2 am: 920b02a94f  -s ours am: aff9286bd6 am: 37ff2d56bf am: 56247334f8 am: 923aef8e02  -s ours am: f199d511c3 am: 1d752340a7 am: 4aacfce724 am: 5b64f51a1c am: 06f0764320
am: 7358e7bcdf  -s ours

Change-Id: I3700a512ec7401190de7fd7177bab7f8880157c4