OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Thu, 19 Nov 2015 16:34:28 +0000 (08:34 -0800)
committerElliott Hughes <enh@google.com>
Thu, 19 Nov 2015 16:34:28 +0000 (08:34 -0800)

Trivial merge