OSDN Git Service

Merge remote-tracking branch \'toybox/master\' into HEAD am: e0f2d3d3e0
authorElliott Hughes <enh@google.com>
Mon, 6 Jun 2016 20:33:26 +0000 (20:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 6 Jun 2016 20:33:26 +0000 (20:33 +0000)
am: 1b6a32c79c

* commit '1b6a32c79ce23995fc87de172af1ea145d5e4853':
  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: Iab69722a3107f3475835283d61a50c2b2a700111


Trivial merge