OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Tue, 6 Oct 2015 21:22:30 +0000 (14:22 -0700)
committerElliott Hughes <enh@google.com>
Tue, 6 Oct 2015 21:22:30 +0000 (14:22 -0700)

Trivial merge