OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Tue, 24 May 2016 22:27:49 +0000 (15:27 -0700)
committerElliott Hughes <enh@google.com>
Tue, 24 May 2016 22:27:49 +0000 (15:27 -0700)

Trivial merge