OSDN Git Service

DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b...
authorJeff Sharkey <jsharkey@android.com>
Fri, 2 Dec 2016 19:20:23 +0000 (19:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 2 Dec 2016 19:20:23 +0000 (19:20 +0000)
am: 0891ca2fad

Change-Id: I2e9897c052ee296d68beb50b6ac927e5a0d92daa


Trivial merge