OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Tue, 29 Nov 2016 00:35:01 +0000 (16:35 -0800)
committerElliott Hughes <enh@google.com>
Tue, 29 Nov 2016 00:35:01 +0000 (16:35 -0800)

Trivial merge