OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Mon, 14 Sep 2015 18:00:20 +0000 (11:00 -0700)
committerElliott Hughes <enh@google.com>
Mon, 14 Sep 2015 18:00:20 +0000 (11:00 -0700)

Trivial merge