OSDN Git Service

Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr1.5-dev
authorJeff Sharkey <jsharkey@google.com>
Fri, 2 Dec 2016 18:20:10 +0000 (18:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 2 Dec 2016 18:20:10 +0000 (18:20 +0000)
am: 0be332852e  -s ours

Change-Id: Ia1266b2276eb2219fbd19aff20985d278bd58fac


Trivial merge