OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Thu, 11 Dec 2014 00:23:36 +0000 (16:23 -0800)
committerElliott Hughes <enh@google.com>
Thu, 11 Dec 2014 00:23:36 +0000 (16:23 -0800)

Trivial merge