OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Tue, 21 Feb 2017 04:29:13 +0000 (20:29 -0800)
committerElliott Hughes <enh@google.com>
Tue, 21 Feb 2017 04:40:24 +0000 (20:40 -0800)
commit7c3d7b13860a5d725a300b71d273cdba5bcd8687
tree134b4f0143793dc7efd8f922cfd9abba0c61e641
parent913e37db63c7a2c85db84a750131cffce56a3005
parentfd866b2f058294cf51a6987a1786ff1bd9e6b1ea
Merge remote-tracking branch 'toybox/master' into HEAD

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