tree 9b0ab4f6cb66e2492ca83f1a9865ba1d9026e7ac
parent 81d9ca51dfc7a1bf5219f7801800d7739fc103ee
parent 869c881d9c174b94452f8ba8ccb1d816625aafe4
author Bjorn Bringert <bringert@android.com> 1259100399 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1259100399 -0800

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

Merge commit '869c881d9c174b94452f8ba8ccb1d816625aafe4'

* commit '869c881d9c174b94452f8ba8ccb1d816625aafe4':
  Guard against null parent in Launcher2.Search.clearAnimation()