OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Tue, 11 Jul 2017 16:04:11 +0000 (09:04 -0700)
committerElliott Hughes <enh@google.com>
Tue, 11 Jul 2017 16:04:29 +0000 (09:04 -0700)
commitb62e8ff3da51c85ae648c871dc76401dbfac9f0f
treed58ba49e43b1b7d3d53b3ab1717b32bdd9d008e4
parentbf4741d56c55172ffbeffdf21b8d2e5ff5916991
parentd4adb3f8e2ec39674e34ed518983ed6e85560c91
Merge remote-tracking branch 'toybox/master' into HEAD

Change-Id: I752a046ed45ada48db41a0b2b11428f5a344b90b
generated/globals.h
generated/newtoys.h