From: Elliott Hughes <enh@google.com>
Date: Fri, 15 Jul 2016 18:30:41 +0000 (+0000)
Subject: Merge remote-tracking branch \\'toybox/master\\' into HEAD am: a126e5f9a2
X-Git-Tag: android-x86-8.1-r1~51^2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f021f2ba3d;p=android-x86%2Fexternal-toybox.git

Merge remote-tracking branch \\'toybox/master\\' into HEAD am: a126e5f9a2
am: e51bec3b3b

Change-Id: I19233a9cd9e2e1d5a8b59961016f7ab0187c6750
---

f021f2ba3dbe42e81194bc0e554e7fa7fdb1aa1c