OSDN Git Service

Merge remote-tracking branch \'toybox/master\' into HEAD am: e0f2d3d3e0 am: 1b6a32c79...
authorElliott Hughes <enh@google.com>
Mon, 6 Jun 2016 20:38:57 +0000 (20:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 6 Jun 2016 20:38:57 +0000 (20:38 +0000)
commit2fbb2e66dd8ec8798539b98cc00046933b11bd70
treecfc02fa0522794a15aec2364adc9a2e472e94565
parent6bb23ab3a0c5dc6e4bc6bf1f90ab0dd83cf89afe
parentfe94459eb4620da96911c90748e5ea086a744928
Merge remote-tracking branch \'toybox/master\' into HEAD am: e0f2d3d3e0 am: 1b6a32c79c am: e31aa50b1d
am: fe94459eb4

* commit 'fe94459eb4620da96911c90748e5ea086a744928':
  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: I6e74de996168212e361309d8d379a22603f73d56