OSDN Git Service

Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev...
authorJeff Sharkey <jsharkey@google.com>
Fri, 2 Dec 2016 18:55:07 +0000 (18:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 2 Dec 2016 18:55:07 +0000 (18:55 +0000)
am: f1085f2dc8

Change-Id: I565994dc5bbfc11b3293cb77aabca77b908a9039


Trivial merge