From: Rob Landley <rob@landley.net>
Date: Sat, 30 Apr 2016 17:03:59 +0000 (+0000)
Subject: Merge remote-tracking branch \'toybox/master\' into HEAD am: 665bd50906 am: ee12b24d75
X-Git-Tag: android-x86-8.1-r1~79^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=def93398bd7153722e9a48ba052d777bfa15bb48;p=android-x86%2Fexternal-toybox.git

Merge remote-tracking branch \'toybox/master\' into HEAD am: 665bd50906 am: ee12b24d75
am: 09ba017639

* commit '09ba01763966031b76763c5a77c9177b1443a550':
  First guess at showing thread names properly.
  Show "-" rather 0 if we don't know whether a process is 32- or 64-bit.
  Fix ps -O help output alignment.

Change-Id: If651ad7da69be51c9daa5ab83bc3cc26968c4961
---

def93398bd7153722e9a48ba052d777bfa15bb48