tree 863a7ee437dd86e38561de5dcab321ccf0960868
parent dfc39aee6417e900e04669e66c473b682faa1863
parent 6ac1aa3d4a649ae2ed57d3bb4116a15b4e5b8a50
author Pirama Arumuga Nainar <pirama@google.com> 1444088770 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444088770 +0000

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

* commit '6ac1aa3d4a649ae2ed57d3bb4116a15b4e5b8a50':
  Safely handle interrupts during Thread.join()