OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Wed, 22 Jun 2016 17:26:11 +0000 (10:26 -0700)
committerElliott Hughes <enh@google.com>
Wed, 22 Jun 2016 17:28:58 +0000 (10:28 -0700)
commit0803f535c044ccc5e293bb7e26cbbbde84114f59
tree72ab1a1e8d2319e7a30c238ed5cca4ffd742e429
parentf6453fed891d4a786f731e7168343d41aedb7adb
parent7159163af32db0ba19d77417763921ad5a16c7fc
Merge remote-tracking branch 'toybox/master' into HEAD

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