tree 173d3fcc09b5cbbc33a5b19826318307ee3b00cd
parent 3f9d7eaeca27e092302218bac4d1f9aeda59305f
parent 999b6a5ecb36405d3697f9fb11df9a5bb0273e73
author The Android Open Source Project <initial-contribution@android.com> 1265388556 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1265388556 -0800

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

Merge commit '999b6a5ecb36405d3697f9fb11df9a5bb0273e73' into eclair-plus-aosp

* commit '999b6a5ecb36405d3697f9fb11df9a5bb0273e73':
  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.