OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Wed, 3 Feb 2016 01:15:43 +0000 (17:15 -0800)
committerElliott Hughes <enh@google.com>
Wed, 3 Feb 2016 01:15:43 +0000 (17:15 -0800)

Trivial merge