tree 04d799974386d9cb905f9678e271e6a78f1fcb4e
parent 6b07bf3d8f8f9b5124c19f1206e11634a774c356
parent 7e4a004799eae347f1be227ecba6850d1b386bd2
author Evan Millar <emillar@google.com> 1257537299 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257537299 -0800

am 7e4a0047: Merge change I97b30e2f into eclair

Merge commit '7e4a004799eae347f1be227ecba6850d1b386bd2' into eclair-mr2

* commit '7e4a004799eae347f1be227ecba6850d1b386bd2':
  Revert jparks code from IPCThreadState.