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:44:38 +0000 (19:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 2 Dec 2016 19:44:38 +0000 (19:44 +0000)
am: 7e54dc58d4  -s ours

Change-Id: I3dce2baad70e1d9d606c27534f4ff4e9435f2445


Trivial merge