tree 76b11a9d3167086a6d69ba71d99ec9c18d9162e4
parent 56636da1c85334b618a3e27d3e5523993c7cbc5d
parent 4602f2b77b6e8405c5c84e2f67749ba83ed39d6c
author Christopher Ferris <cferris@google.com> 1454094869 +0000
committer android-build-merger <android-build-merger@google.com> 1454094869 +0000

Merge "Always have ps output to stdout at least one line."
am: 4602f2b77b

* commit '4602f2b77b6e8405c5c84e2f67749ba83ed39d6c':
  Always have ps output to stdout at least one line.