OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Sun, 15 Jan 2017 19:24:30 +0000 (11:24 -0800)
committerElliott Hughes <enh@google.com>
Sun, 15 Jan 2017 19:29:43 +0000 (11:29 -0800)
commit7a49753b15c998ec82851a7a7f4eb4d9ac67c7d8
tree333fe5cbf01ed49ae7f544c8d3c5e8f1945a5bf0
parent0fcfdec760b07294a922181fe4cf5583f536d653
parent12fcf08b5c96238530148d7d9975642b2299e39a
Merge remote-tracking branch 'toybox/master' into HEAD

Change-Id: Ifcffe984c4e2cdca85d800300d80cf6dfea5af0b
.config
Android.mk
generated/config.h
generated/flags.h
generated/globals.h
generated/help.h
generated/newtoys.h