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()