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:19:28 +0000 (20:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 2 Dec 2016 20:19:28 +0000 (20:19 +0000)
am: 6786309c03

Change-Id: Ie17a80be06549016951ff91792586e1dc2e004cc


Trivial merge