tree 24e56f5da884daf8808448206aee620ec19bdc75
parent c3716ca85b110eb9542cd371f8197290a43f5557
parent 3ef390afb277e0ea3a256421afbcb3b05e6f3392
author Jeff Sharkey <jsharkey@google.com> 1480711241 +0000
committer android-build-merger <android-build-merger@google.com> 1480711241 +0000

Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836  -s ours am: 99b97e5ed1 am: 398cdb6929 am: f00515f4d9 am: 17d6ba41b8 am: 95d6c7e59a" into nyc-mr2-dev-plus-aosp
am: 3ef390afb2  -s ours

Change-Id: I24872c24ea2231e1dff28dd1046602be192534a1