tree 0890cf1cc921f6b129b80b0b6da2207dc313da83
parent 52f918e43a6a34a2bca2fb95ff0c72273b59305a
parent 600f188702c1ce8e5c250ea049a5e22f4ff17577
author Bjorn Bringert <bringert@android.com> 1258995343 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258995343 -0800

am 600f1887: Guard against null parent in Launcher2.Search.clearAnimation()

Merge commit '600f188702c1ce8e5c250ea049a5e22f4ff17577' into eclair-mr2

* commit '600f188702c1ce8e5c250ea049a5e22f4ff17577':
  Guard against null parent in Launcher2.Search.clearAnimation()