From: Elliott Hughes <enh@google.com>
Date: Fri, 6 May 2016 20:09:55 +0000 (+0000)
Subject: Merge remote-tracking branch \'toybox/master\' into HEAD am: 93eb0e019e
X-Git-Tag: android-x86-7.1-r1~6^2~32
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7bdecc3b26;p=android-x86%2Fexternal-toybox.git

Merge remote-tracking branch \'toybox/master\' into HEAD am: 93eb0e019e
am: a1f82e90c4

* commit 'a1f82e90c421498ce800c36aa17b3c5a30b6eea0':
  Fix static linkage of toybox binary.
  Add top -H.
  Android roadmap update.

Change-Id: I939d6447e08a9d48f9b4d9bcc06c7d53831ade99
---

7bdecc3b26d4f89aace94736acd95c03e894130b