OSDN Git Service

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

Trivial merge