OSDN Git Service

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

Change-Id: I2a67bbde8b3e131ba62cedd0b6629912e226ba90


Trivial merge