am ca3e5aea: Merge "Retry if interrupted before mMessageThread has joined"
am ca3e5aea: Merge "Retry if interrupted before mMessageThread has joined"

* commit 'ca3e5aeaa65ae1d77ce92f082ab789933eb18237':
  Retry if interrupted before mMessageThread has joined

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