OSDN Git Service

Merge "DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am...
authorJeff Sharkey <jsharkey@android.com>
Fri, 2 Dec 2016 20:33:32 +0000 (20:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 2 Dec 2016 20:33:32 +0000 (20:33 +0000)
am: 89ecf83fa6  -s ours

Change-Id: I01a9ae19bc9ae3d1eed5285f47fff4d5c8f9fa9e


Trivial merge