OSDN Git Service

Merge remote-tracking branch \'toybox/master\' into HEAD am: 2305dc0dd2
authorElliott Hughes <enh@google.com>
Fri, 29 Apr 2016 21:20:31 +0000 (21:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 29 Apr 2016 21:20:31 +0000 (21:20 +0000)
commite5f725e2055630545a3fafcca644200c599fb9da
tree91dd4dd5f4e22b413f537dc165c0f2ba23a70a02
parentdc49e7d71fb9d623c35e8dac4d3c6f15c81dabc6
parent5e9d6ffc295d032659045b0374ebf1434fc1288d
Merge remote-tracking branch \'toybox/master\' into HEAD am: 2305dc0dd2
am: 5e9d6ffc29

* commit '5e9d6ffc295d032659045b0374ebf1434fc1288d':
  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: Idd28f5ad3481a0ea9650f8033ae945e226c9f60a