OSDN Git Service

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

Change-Id: Iee87f3c3d384bf785b3c6c877a817c35bbdb478b


Trivial merge