OSDN Git Service

Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev am...
authorJeff Sharkey <jsharkey@google.com>
Fri, 2 Dec 2016 19:46:36 +0000 (19:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 2 Dec 2016 19:46:36 +0000 (19:46 +0000)
am: 923aef8e02  -s ours

Change-Id: Ia0d0ac5ed1f8a84bd9158530fde499f91ac7f411


Trivial merge