am f96fe1bc: am 5c4510e9: am 8b211af1: Merge "FocusFinderTest Workarounds..." into froyo

Merge commit 'f96fe1bc4a63f5e01e9ce10082bc1a931079c185'

* commit 'f96fe1bc4a63f5e01e9ce10082bc1a931079c185':
  FocusFinderTest Workarounds...