OSDN Git Service

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

Change-Id: Iabb21a28a245d36f2247eaace573bdfd134f382d


Trivial merge