From: Alistair Strachan <alistair.strachan@imgtec.com>
Date: Fri, 6 May 2016 20:05:13 +0000 (+0000)
Subject: Merge remote-tracking branch \'toybox/master\' into HEAD
X-Git-Tag: android-x86-7.1-r1~6^2~32^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a1f82e90c421498ce800c36aa17b3c5a30b6eea0;p=android-x86%2Fexternal-toybox.git

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

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

Change-Id: I34da7d5e50fd36d07fa5d935cbdb2956cce98c1c
---

a1f82e90c421498ce800c36aa17b3c5a30b6eea0