tree 1b12bbac762c64ff52ddc908c7744d13e91901b0
parent 8905657ea4b25ac6ee2820f79d6d9ed90aa2122e
parent f05c9f97b39d4d17658577416dcc16d85c7582db
author Andrew Hsieh <andrewhsieh@google.com> 1374520665 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1374520665 -0700

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

* commit 'f05c9f97b39d4d17658577416dcc16d85c7582db':
  Workaround for libportable wait4 implementation.