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 22:27:11 +0000 (22:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 2 Dec 2016 22:27:11 +0000 (22:27 +0000)
am: 29e38b212f

Change-Id: I40543d50c8c40688ebd2e28a05ade6284c8942d2


Trivial merge