tree 25b05660265dbd9d5e0b0d45e65e7bdd6b585282
parent 455ac29812f0246a8c91530325b765578fce6f47
parent 292bee2f74e860f089fb4d1148e72f5816c78100
author Jeff Sharkey <jsharkey@google.com> 1480706517 +0000
committer android-build-merger <android-build-merger@google.com> 1480706517 +0000

Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr1.5-dev am: 0be332852e  -s ours am: b685f719f1 am: 45b6a52225 am: 34b87d94e4 am: 30ef1ad5be am: 652521ae7b
am: 292bee2f74  -s ours

Change-Id: I2be817a6f58b8bbcd050123dd987424603d702f9