tree 24e56f5da884daf8808448206aee620ec19bdc75
parent d1946896cea34f01dc60844f7af7eb71f3acf788
parent c0e91458bf4644e44364777a35470670d6344682
author Jeff Sharkey <jsharkey@google.com> 1480710506 +0000
committer android-build-merger <android-build-merger@google.com> 1480710506 +0000

Merge "Merge "Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfce4 am: 471812ad04 am: 4610805746  -s ours am: aeeb9c8470 am: 8c74832d5e am: 07ad2a9063 am: a75ce3a705" into nyc-mr1-dev-plus-aosp am: 30aca837c8" into nyc-mr2-dev-plus-aosp
am: c0e91458bf  -s ours

Change-Id: Iae55b7bc8f4ace84533e7ddfc13b9bb0edd28c98