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:02:36 +0000 (19:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 2 Dec 2016 19:02:36 +0000 (19:02 +0000)
am: e0fe3201cb

Change-Id: Ifbfd912aac170923e5aea43e3b5ba9cfe135cea5


Trivial merge