tree 5e880cb26b8b8c6cdaf765d9c84cfd526a07560b
parent b9018f8b325ba39c8f20f463a41697fcfd7eabde
parent 8e65068636d88ed7d280a4cb68c0f37dbeacb6ef
author Joe Onorato <joeo@android.com> 1256852603 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1256852603 -0700

am 8e650686: am b5e94cca: am 859b3a74: fix bug 2200625 - NPE at com.android.launcher2.AllAppsView.onTouchEvent(AllAppsView.java:259) on Passion

Merge commit '8e65068636d88ed7d280a4cb68c0f37dbeacb6ef'

* commit '8e65068636d88ed7d280a4cb68c0f37dbeacb6ef':
  fix bug 2200625 - NPE at com.android.launcher2.AllAppsView.onTouchEvent(AllAppsView.java:259) on Passion