OSDN Git Service

am bc7391d8: resolved conflicts for 93db3d4b to cw-e-dev
authorPirama Arumuga Nainar <pirama@google.com>
Fri, 9 Oct 2015 17:37:44 +0000 (17:37 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 9 Oct 2015 17:37:44 +0000 (17:37 +0000)
* commit 'bc7391d81a0d224a52124fdc87c0ab0cca453917':
  Retry if interrupted before mMessageThread has joined


Trivial merge