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

Change-Id: I8f09aaed1be7f86cfb0a2cbe91ae5b4fe881df07


Trivial merge