OSDN Git Service

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

Change-Id: I9895591df11a2416cd3191ac9c790ecac167ece5


Trivial merge