OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Fri, 29 Apr 2016 18:57:24 +0000 (11:57 -0700)
committerElliott Hughes <enh@google.com>
Fri, 29 Apr 2016 18:57:24 +0000 (11:57 -0700)

Trivial merge