From: Elliott Hughes <enh@google.com>
Date: Tue, 2 Aug 2016 17:32:27 +0000 (+0000)
Subject: Merge remote-tracking branch 'toybox/master' into HEAD am: a1ce46baab
X-Git-Tag: android-x86-8.1-r1~47^2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0f3ba9ca9a;p=android-x86%2Fexternal-toybox.git

Merge remote-tracking branch 'toybox/master' into HEAD am: a1ce46baab
am: da5a402a93

Change-Id: I55d8d9b1865cd0968db132bbebef55cd39985c8a
---

0f3ba9ca9ae39468c94d6a12af50f769045463d1