am ed6dd2e6: am d3bc1994: Merge change I397b6a93 into eclair

Merge commit 'ed6dd2e6a5921044ba841f17627d7a8cd444171a' into eclair-mr2-plus-aosp

* commit 'ed6dd2e6a5921044ba841f17627d7a8cd444171a':
  Don't accidentally signal multiple exceptions in setThreadPriority()