OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Wed, 3 Dec 2014 02:42:51 +0000 (18:42 -0800)
committerElliott Hughes <enh@google.com>
Wed, 3 Dec 2014 02:42:51 +0000 (18:42 -0800)

Trivial merge