tree d963f7218af3134d85fa4534e07b11a0f279bf4b
parent d081cb0ab79971e53b2790a74b1d24cfb5976924
parent c130d7fd5ea010fac0abc7d04422adf72c393346
author Jeff Sharkey <jsharkey@google.com> 1480705889 +0000
committer android-build-merger <android-build-merger@google.com> 1480705889 +0000

Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev am: 6b89229d14 am: a7efe16fe1  -s ours am: f1085f2dc8
am: c130d7fd5e

Change-Id: I15e9c5f864ec67c8bf5901fcc46abe0c7b362a6e