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

* commit '6ac1aa3d4a649ae2ed57d3bb4116a15b4e5b8a50':
  Safely handle interrupts during Thread.join()
tree: dccfcad00c15b6f5c882c5d0fa24e502e8f9a646
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. wrap_alpha.py