OSDN Git Service

DO NOT MERGE. Check provider access for content changes. am: 9b85862620 -s ours...
authorJeff Sharkey <jsharkey@android.com>
Fri, 2 Dec 2016 20:10:37 +0000 (20:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 2 Dec 2016 20:10:37 +0000 (20:10 +0000)
am: 43b3a13803

Change-Id: I5f4f250100c3b9f63149add16f0086c77ccdf7ca


Trivial merge