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

Merge remote-tracking branch 'toybox/master' into HEAD am: d2ed825752
am: 59b7525e7e

Change-Id: Ie4e8169296809996e3064ff0ba1c3f528a04d9cb
---

6c39691c66cc76b82320bb2e5b34af1c9bd961bd