tree a2f41d52a4c51fd238396024a31a5dd96d086665
parent 117ab834afeda844b8b065e78f7a80c32952f3b1
parent 6c0bb93d7fd5d7b279885c8f7f07970cdbbc9f99
author Romain Guy <romainguy@android.com> 1254422508 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1254422508 -0700

am 6c0bb93d: Merge change Ia7313db2 into eclair

Merge commit '6c0bb93d7fd5d7b279885c8f7f07970cdbbc9f99'

* commit '6c0bb93d7fd5d7b279885c8f7f07970cdbbc9f99':
  Prevent crash when dropping an icon.