OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Mon, 4 Dec 2017 18:10:29 +0000 (10:10 -0800)
committerElliott Hughes <enh@google.com>
Mon, 4 Dec 2017 18:19:00 +0000 (10:19 -0800)
commitb4d75fdc5e2d792cc646aa6a1d40850c194e273d
tree9646ea83ecded8a302161689721fed0f6e4d3981
parent73fd808900b5a6c0df7bcd9900dad37f37367f3f
parent7ac95e1aacc6a93fd14f8c3a7764fff2537647de
Merge remote-tracking branch 'toybox/master' into HEAD

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