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 20:35:56 +0000 (20:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 2 Dec 2016 20:35:56 +0000 (20:35 +0000)
am: 341813c852

Change-Id: Ia32a4880fc1c050122050099660d23322a51bbcc


Trivial merge