From: Elliott Hughes <enh@google.com>
Date: Fri, 2 Jun 2017 21:36:35 +0000 (+0000)
Subject: Merge remote-tracking branch 'toybox/master' into HEAD am: fe3d63b269
X-Git-Tag: android-x86-8.1-r1^2~7^2^2^2
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fexternal-toybox.git;a=commitdiff_plain;h=3622386f99adaf25167234241f132d8a646ca66b

Merge remote-tracking branch 'toybox/master' into HEAD am: fe3d63b269
am: 21b59f15b6

Change-Id: I8587fbaf631b789749f9f7d6ec30bbd309f3bad0
---

3622386f99adaf25167234241f132d8a646ca66b