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

Change-Id: I32c59ff8fd27596728ba87180cdf8e0c06d0d6ba


Trivial merge