OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Mon, 29 Feb 2016 21:46:26 +0000 (13:46 -0800)
committerElliott Hughes <enh@google.com>
Mon, 29 Feb 2016 21:46:26 +0000 (13:46 -0800)

Trivial merge