From: Rob Landley <rob@landley.net>
Date: Fri, 29 Apr 2016 21:22:44 +0000 (+0000)
Subject: Merge remote-tracking branch \'toybox/master\' into HEAD am: 2305dc0dd2 am: 5e9d6ffc29
X-Git-Tag: android-x86-8.1-r1~81^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4c5b6b563ce1b9f388ca2934226d0a8be2ce3acb;p=android-x86%2Fexternal-toybox.git

Merge remote-tracking branch \'toybox/master\' into HEAD am: 2305dc0dd2 am: 5e9d6ffc29
am: e5f725e205

* commit 'e5f725e2055630545a3fafcca644200c599fb9da':
  ps thread supportand 32/64 bit detection.
  Fix find bug reported by Tom Marshall, add test for it, and while we're at it fix two tests looking for a too-specific error message (so TEST_HOST failed).
  Add "infrastructure in search of a user" to cleanup.html.
  Add the non-tty more(1) test.

Change-Id: Ie6591e2ec6f33c49513c25d5bdcc20883dd10732
---

4c5b6b563ce1b9f388ca2934226d0a8be2ce3acb