From: Elliott Hughes <enh@google.com>
Date: Fri, 10 Jun 2016 16:55:40 +0000 (+0000)
Subject: Merge remote-tracking branch \\'toybox/master\\' into HEAD am: c0fec89dcf
X-Git-Tag: android-x86-7.1-r1~6^2~20
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=80af18ab32;p=android-x86%2Fexternal-toybox.git

Merge remote-tracking branch \\'toybox/master\\' into HEAD am: c0fec89dcf
am: e389dc2bc4

Change-Id: I10b66f2ef5eaa4d3383e8a82d41d1f1ff10ac67a
---

80af18ab32d78a898308df30d891cab7e2e5cdff