tree 883dcde3c10719f6e9499a93d7c0118a9b21a269
parent a793aee959307f5b7123b08f92345a87c4630459
parent 375f16eff43c11e25355f7b697f41826668a68bf
author Jeff Sharkey <jsharkey@google.com> 1480717563 +0000
committer android-build-merger <android-build-merger@google.com> 1480717563 +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 am: 948841362a am: 7e54dc58d4  -s ours am: 3fa188bd8f am: 09960bdfcc am: d12e48494d am: 341813c852
am: 375f16eff4

Change-Id: Ia7400dc5280a87cfa687c0b84b124bdb8db6381d