OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Fri, 8 Jul 2016 00:02:37 +0000 (17:02 -0700)
committerElliott Hughes <enh@google.com>
Fri, 8 Jul 2016 00:06:35 +0000 (17:06 -0700)
commite7b74ae6b0b92c28f9d0e025307636d0033a43b5
treee333394084ed6ac8aec171e43b3cc53f8d96982e
parentba38a4371a8b43f7df53cc1f39422c256579d360
parentff0e8cb15c39d59b0530ac0e0a1243a510ae5c06
Merge remote-tracking branch 'toybox/master' into HEAD

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