tree fecf97718814bbc05dc6559d842739ca4d0bbd4e
parent 54009f7e95e2f9fffbcc771b4495a72045c5f381
parent 85f9f764507761e011fc14398e7ddf08b5d383c5
author Andrew Hsieh <andrewhsieh@google.com> 1374520440 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1374520440 -0700

am 85f9f764: Merge "Workaround for libportable wait4 implementation."

* commit '85f9f764507761e011fc14398e7ddf08b5d383c5':
  Workaround for libportable wait4 implementation.