tree 9101c17f6134d7c2f18a956fb50816695689e888
parent c59ba4595be25a1213955233fcf9bcd1afe6438e
parent be741d472868a8ffcb455588f18cda889b0f465c
author Elliott Hughes <enh@google.com> 1331597555 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1331597555 -0700

am be741d47: am 2f460fbe: am 73b5cad9: Merge "bionic: Fix wrong kernel_id in pthread descriptor after fork()"

* commit 'be741d472868a8ffcb455588f18cda889b0f465c':
  bionic: Fix wrong kernel_id in pthread descriptor after fork()