tree 8436915100ab06a84ce175c1f41b9d17e34ab2c7
parent d9a180496282d51dfe0c1c260299d31c2d16c06a
parent 30aca837c84909383862748ca5483136f887a29e
author Jeff Sharkey <jsharkey@google.com> 1480708489 +0000
committer android-build-merger <android-build-merger@google.com> 1480708489 +0000

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

Change-Id: I376248947975df72dd8e597f2ed17d469e58c39e