OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Mon, 22 Aug 2016 20:45:55 +0000 (13:45 -0700)
committerElliott Hughes <enh@google.com>
Mon, 22 Aug 2016 20:48:19 +0000 (13:48 -0700)
commita0637cef8f3e5c6a99a14982ee33d31e5927bc57
treebfcef40a6a7c4b54c636c5cf019e47ad8839b6bb
parenta1ce46baabb7e91e01daccbe0bfaaff787200086
parentbfbf1a89be7bf25b836a8a2333207f7065f7935b
Merge remote-tracking branch 'toybox/master' into HEAD

Change-Id: I7018a680508d767b89418cede90c0bd9ba0bd53c
Android.mk
generated/flags.h
generated/globals.h
generated/help.h
generated/newtoys.h
toys/posix/ls.c