am 8b211af1: Merge "FocusFinderTest Workarounds..." into froyo

Merge commit '8b211af1e965f382b37da58a17ce51785b3403fb' into gingerbread

* commit '8b211af1e965f382b37da58a17ce51785b3403fb':
  FocusFinderTest Workarounds...