tree 0890cf1cc921f6b129b80b0b6da2207dc313da83
parent db1eb1bd40f68d53a89085ff10e54dc22393791d
parent 2b68660d0a5a83a42a0cfc1e9258bbbd2b96bfc3
author Bjorn Bringert <bringert@android.com> 1259100051 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1259100051 -0800

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

Merge commit '2b68660d0a5a83a42a0cfc1e9258bbbd2b96bfc3' into eclair-mr2-plus-aosp

* commit '2b68660d0a5a83a42a0cfc1e9258bbbd2b96bfc3':
  Guard against null parent in Launcher2.Search.clearAnimation()