am 03c06bc9: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '03c06bc9f44626eae1af9901aaddfb4e6e911c6a':
  Prevent IPCThreadState::joinThreadPool from spinning on unexpected error
This commit is contained in:
The Android Open Source Project 2013-06-12 18:06:09 -07:00 committed by Android Git Automerger
commit 10e42969e6

Diff Content Not Available