OSDN Git Service

Merge remote-tracking branch \'toybox/master\' into HEAD am: 665bd50906
authorElliott Hughes <enh@google.com>
Sat, 30 Apr 2016 17:00:32 +0000 (17:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 30 Apr 2016 17:00:32 +0000 (17:00 +0000)
commit09ba01763966031b76763c5a77c9177b1443a550
tree8f0a0bc969f95074c847098aaa20086df8b02f83
parent12d0a534801ab829f8e7ce3bb267e2d78360638b
parentee12b24d751225f4e04c67edaa31610cad77f737
Merge remote-tracking branch \'toybox/master\' into HEAD am: 665bd50906
am: ee12b24d75

* commit 'ee12b24d751225f4e04c67edaa31610cad77f737':
  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: I15b34c904196f8754e8be659642367b70d042ced