am 46b51097: Merge "Safely handle interrupts during Thread.join()"
am 46b51097: Merge "Safely handle interrupts during Thread.join()"

* commit '46b51097b92900866ac5b25762f622d3ceb1be5d':
  Safely handle interrupts during Thread.join()

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