OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Thu, 21 Apr 2016 01:22:50 +0000 (18:22 -0700)
committerElliott Hughes <enh@google.com>
Thu, 21 Apr 2016 01:22:50 +0000 (18:22 -0700)

Trivial merge