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

Change-Id: I66fdc5fb2ca169453b6b2f5dc7d6c10360aea709


Trivial merge