OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Tue, 7 Jul 2015 01:17:00 +0000 (18:17 -0700)
committerElliott Hughes <enh@google.com>
Tue, 7 Jul 2015 01:17:00 +0000 (18:17 -0700)

Trivial merge