OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Sun, 29 Mar 2015 18:42:22 +0000 (11:42 -0700)
committerElliott Hughes <enh@google.com>
Sun, 29 Mar 2015 18:42:22 +0000 (11:42 -0700)

Trivial merge