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 22:26:03 +0000 (22:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 2 Dec 2016 22:26:03 +0000 (22:26 +0000)
am: 375f16eff4

Change-Id: Ia7400dc5280a87cfa687c0b84b124bdb8db6381d


Trivial merge