tree d1ae647717d408308b8f9bae53abaf96cc780cbc
parent 6216dcacf73a18e427469a87598a017db1ac2645
parent 5c4510e999b9d1be8f93cffef96886c6724646d7
author Brian Muramatsu <btmura@android.com> 1284166609 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284166609 -0700

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

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

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