OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Fri, 15 Jul 2016 17:14:33 +0000 (10:14 -0700)
committerElliott Hughes <enh@google.com>
Fri, 15 Jul 2016 17:22:31 +0000 (10:22 -0700)
commita126e5f9a29270523c108db20e0b1b64e961be58
tree8ae55f598971c70d55ce4eaf0796070360439c26
parent5bb7e2581e59b72ffaa5cd3059d9620a80451f24
parentf61b1439e9140938e4244a71a8c1c721fa4ca9f7
Merge remote-tracking branch 'toybox/master' into HEAD

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