tree 952c952caf9c81359994ad899f89076571ec6d22
parent a1d1ecbe05d89b06d7fe9873c5ed86613a226b33
parent ce477912a2c8c6945e72be79973f1c4157fed915
author Jeff Sharkey <jsharkey@google.com> 1480703418 +0000
committer android-build-merger <android-build-merger@google.com> 1480703418 +0000

Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev am: ae7d4b1339  -s ours
am: ce477912a2

Change-Id: I1f05c5204e6ba49a95a8b21cb457b04fe6738cb0