OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Wed, 26 Oct 2016 16:51:00 +0000 (09:51 -0700)
committerElliott Hughes <enh@google.com>
Wed, 26 Oct 2016 16:52:21 +0000 (09:52 -0700)
commit991623dec1421da4d78f5fc3dd8e6694af348166
treeed3e52219ebdbdd4dd82187212bdf0d67cde5654
parentfb3ebf8f5d9760cd7ee843c70fd2e503e7b51d95
parent31c519dcd7fba4291adfdb9f0d273929cdab7eb4
Merge remote-tracking branch 'toybox/master' into HEAD

Change-Id: I941b7746e631fd0c69888fa2b8b582dc85b2cb8f
generated/flags.h
generated/globals.h
generated/help.h
generated/newtoys.h
toys/android/setprop.c