tree d7c0b66acc8a7445ae44f3726328ee9eeae3004d
parent 9088af19b45d1b7339b982c92ef9113337f5d2c6
parent 6eb978c9bf02d2bcdece2826577cc65900030690
author Elliott Hughes <enh@google.com> 1363907902 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363907902 -0700

am 6eb978c9: Merge "Expose wait4 as wait4 rather than __wait4."

* commit '6eb978c9bf02d2bcdece2826577cc65900030690':
  Expose wait4 as wait4 rather than __wait4.