From: Elliott Hughes <enh@google.com>
Date: Wed, 22 Jun 2016 18:28:39 +0000 (+0000)
Subject: Merge remote-tracking branch \\'toybox/master\\' into HEAD am: 0803f535c0
X-Git-Tag: android-x86-7.1-r1~6^2~17
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2ec6bb69327452f2655eecad55d81065456d64d1;p=android-x86%2Fexternal-toybox.git

Merge remote-tracking branch \\'toybox/master\\' into HEAD am: 0803f535c0
am: 092461d02d

Change-Id: I248376888406a9beef0266bbc19a16c34c12a934
---

2ec6bb69327452f2655eecad55d81065456d64d1