OSDN Git Service

Merge remote-tracking branch \'toybox/master\' into HEAD am: e0f2d3d3e0 am: 1b6a32c79c
authorPaul Barker <paul@paulbarker.me.uk>
Mon, 6 Jun 2016 20:36:25 +0000 (20:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 6 Jun 2016 20:36:25 +0000 (20:36 +0000)
am: e31aa50b1d

* commit 'e31aa50b1d00b49a3ce9d57f9b82522cf26fa78b':
  Fix TOYBOX_VERSION
  Basic success/failure return from pgrep/pkill.
  ps: Show [stat2] for any otherwise blank process name field, expand TNAME to 27, use generated constant for stat field parsing loop.
  In cp -a, don't complain if non-root user can't chown, failure is expected.
  Add output path to cp error message filenames.

Change-Id: I8a85492ccc9bfb967fba22c1285558e4613f613b


Trivial merge