tree 538705d9ce1b46d185ed13bfc94fcfd9bb0aa541
parent ee144b1e60a88e8f097113e046813f0b61c38b9b
parent 46b51097b92900866ac5b25762f622d3ceb1be5d
author Pirama Arumuga Nainar <pirama@google.com> 1444088018 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444088018 +0000

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

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