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

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

Change-Id: Ie338e8e67633f5b1ca4e022f8c41b1839e413449
---

acc11f07209ebe7be90b66ddfb2c04b2e10fbf65