am c11b225c: am 7e4a0047: Merge change I97b30e2f into eclair
am c11b225c: am 7e4a0047: Merge change I97b30e2f into eclair

Merge commit 'c11b225c43a5bf1b19b53cd022b401bd0ee92172' into eclair-mr2-plus-aosp

* commit 'c11b225c43a5bf1b19b53cd022b401bd0ee92172':
  Revert jparks code from IPCThreadState.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base