From: Elliott Hughes <enh@google.com>
Date: Wed, 28 Oct 2015 21:41:16 +0000 (-0700)
Subject: Merge remote-tracking branch 'toybox/master' into HEAD
X-Git-Tag: android-x86-6.0-r1~64^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c5d47d26b7;p=android-x86%2Fexternal-toybox.git

Merge remote-tracking branch 'toybox/master' into HEAD
---

c5d47d26b71a1468245e1cff372361c48928fc63