tree 1f41cf27a6d59665bef4eac4bfb0f5aec4691f24
parent 82e1a27ba0367e7d5ca8df8cbfc4c0781688bf5a
parent 938cb839512159fb622f919271d121dfe50332b0
author The Android Open Source Project <initial-contribution@android.com> 1265408653 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1265408653 -0800

am 938cb839: am 999b6a5e: reconcile main tree with open-source eclair

Merge commit '938cb839512159fb622f919271d121dfe50332b0'

* commit '938cb839512159fb622f919271d121dfe50332b0':
  android-2.1_r1 snapshot
  Keep banging on the launcher locks up bug.  This moves the
  Fix 2257802 - Screen unresponsive when you get a call while moving the shortcuts or widgets on home screen
  Fix bug 2258128 - homescreen on Passion unresponsive while still not leaking the contexts.