OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Thu, 21 Jan 2016 04:29:28 +0000 (20:29 -0800)
committerElliott Hughes <enh@google.com>
Thu, 21 Jan 2016 04:29:28 +0000 (20:29 -0800)

Trivial merge