tree 812d61a70d44d076e378f9b5bb043a58b409b9c0
parent 877ad30fd6e8745b43063947a9220d1f1398ee02
parent bc3740787ac4108c2e0e247bc7ca2ea66329c5ab
author Elliott Hughes <enh@google.com> 1346802464 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346802464 -0700

am bc374078: am 5ff23471: Merge "Add getsid system call to bionic"

* commit 'bc3740787ac4108c2e0e247bc7ca2ea66329c5ab':
  Add getsid system call to bionic