OSDN Git Service

am 03c06bc9: (-s ours) Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 13 Jun 2013 01:06:09 +0000 (18:06 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 13 Jun 2013 01:06:09 +0000 (18:06 -0700)
commit10e42969e6869c438244974495c9c71cdf3ec7be
treed3fe460f067c6a275d7031f50d1efa3cc62a8aa2
parent32dbac87fd02b7a747f04bc9fa19eddc5e2cdb92
parent03c06bc9f44626eae1af9901aaddfb4e6e911c6a
am 03c06bc9: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '03c06bc9f44626eae1af9901aaddfb4e6e911c6a':
  Prevent IPCThreadState::joinThreadPool from spinning on unexpected error