OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Fri, 10 Jun 2016 16:42:10 +0000 (09:42 -0700)
committerElliott Hughes <enh@google.com>
Fri, 10 Jun 2016 16:42:10 +0000 (09:42 -0700)

Trivial merge