OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Mon, 11 Jan 2016 17:57:02 +0000 (09:57 -0800)
committerElliott Hughes <enh@google.com>
Mon, 11 Jan 2016 17:57:02 +0000 (09:57 -0800)

Trivial merge