OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Thu, 9 Jun 2016 15:21:00 +0000 (08:21 -0700)
committerElliott Hughes <enh@google.com>
Thu, 9 Jun 2016 15:21:11 +0000 (08:21 -0700)
commit73f8634ae07a311deb2d6e79317b88e959cba8d3
tree9463f26b2796ebaad1d07bf13bcdfa43729bada0
parente0f2d3d3e0f5815582a2d9a328cf2f94cf8172ec
parent2009d0af7081bb42e35db6ff4eb4e39e7474c10c
Merge remote-tracking branch 'toybox/master' into HEAD

Change-Id: I703e4ec03f0eb2a5a215ac07407e094a92f0d161
generated/flags.h
generated/newtoys.h