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

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

Change-Id: I29e191c065fa740cd1f89909c6d3ff9e7640fbb2
---

da5a402a934a275385d77429c8966f9b6efc94ec