OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Sat, 18 Apr 2015 20:40:26 +0000 (13:40 -0700)
committerElliott Hughes <enh@google.com>
Sat, 18 Apr 2015 20:40:26 +0000 (13:40 -0700)

Trivial merge