tree 3fec970fa59b8992fd824d09681df481061a1116
parent f91d63e2b88291dcf7d2c03ccdcd1a7233e56363
parent 3b94cef1b75893f98ad3011a09582405bb32baf4
author Yusuke Sato <yusukes@google.com> 1440210908 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440210908 +0000

am 3b94cef1: Merge "Add FORK_EXECVP_OPTION_CAPTURE_OUTPUT to logwrap.h"

* commit '3b94cef1b75893f98ad3011a09582405bb32baf4':
  Add FORK_EXECVP_OPTION_CAPTURE_OUTPUT to logwrap.h