tree 0fc888e60d084ac7edcf21c99866fcfe7fbb83ea
parent 12b2f8a275d8f1e472f27c58d895d32fad22cca1
parent 398cdb692920cc0a174ff6e438904a560d4d5417
author Jeff Sharkey <jsharkey@google.com> 1480706481 +0000
committer android-build-merger <android-build-merger@google.com> 1480706481 +0000

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

Change-Id: I40a0cb7f416d843b12893656d16dfed97d0df058