OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Mon, 11 Jul 2016 18:44:51 +0000 (11:44 -0700)
committerElliott Hughes <enh@google.com>
Mon, 11 Jul 2016 19:33:16 +0000 (12:33 -0700)
commit5bb7e2581e59b72ffaa5cd3059d9620a80451f24
tree0289fbae636edc2e521d10a38fb4b5d78feae43a
parentf3304b364a705b63aaa42b82ee4c13b86a4ce93d
parentd5088a059649daf34e729995bb3daa3eb64fa432
Merge remote-tracking branch 'toybox/master' into HEAD

Change-Id: I446cfc9f3afd6b76c2dc448119bfecd78f511ea8
generated/globals.h
generated/help.h