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

Merge commit '5c4510e999b9d1be8f93cffef96886c6724646d7' into gingerbread-plus-aosp

* commit '5c4510e999b9d1be8f93cffef96886c6724646d7':
  FocusFinderTest Workarounds...