OSDN Git Service

Merge remote-tracking branch 'toybox/master' into HEAD
authorElliott Hughes <enh@google.com>
Thu, 26 Jan 2017 04:07:12 +0000 (20:07 -0800)
committerElliott Hughes <enh@google.com>
Thu, 26 Jan 2017 04:08:32 +0000 (20:08 -0800)
commitcae4495189d228cd8938ce51c8c771502b053ef1
treee71f8c3dadf7e9a2e5adcef504879c24f82abd9f
parent7a49753b15c998ec82851a7a7f4eb4d9ac67c7d8
parent102841199bee9cc76f3fff4335d6dbdd3c0cc8ab
Merge remote-tracking branch 'toybox/master' into HEAD

Change-Id: Ic08d492bfa09d39ca1a968e1fa9fc873f1161630
Android.mk
generated/globals.h
generated/help.h