OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Tue, 5 May 2015 20:15:19 +0000 (13:15 -0700)
committerElliott Hughes <enh@google.com>
Tue, 5 May 2015 20:15:19 +0000 (13:15 -0700)

Trivial merge