OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Fri, 7 Aug 2015 20:31:14 +0000 (13:31 -0700)
committerElliott Hughes <enh@google.com>
Fri, 7 Aug 2015 20:31:14 +0000 (13:31 -0700)

Trivial merge