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

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