Android 2.2 CTS release 5
Merge "Add Delay to ThreadTest#test_getState" into froyo