OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Mon, 19 Jun 2017 19:47:01 +0000 (12:47 -0700)
committerElliott Hughes <enh@google.com>
Mon, 19 Jun 2017 20:43:50 +0000 (13:43 -0700)
commitf353b240a5e39ca3916362a08c5e4f61c1624dd6
tree53fdf77f25724ab8ff0e4d6342b94c40f7143a37
parentfe3d63b2690993d2bd6b11589a7c4bf1c285b7c1
parentf5907c9546fb25acd95133f2243f210408fa1505
Merge remote-tracking branch 'toybox/master' into HEAD

Change-Id: If21b4f8a327f584912c9021d9792031e6d79c065
Android.mk
generated/flags.h
generated/globals.h
generated/help.h
generated/newtoys.h
lib/portability.h