tree 5e880cb26b8b8c6cdaf765d9c84cfd526a07560b
parent 477f9cd577da857347443c35056cb03dea47cf0a
parent 859b3a7453c7b631a34acde4df9bdca680967520
author Joe Onorato <joeo@android.com> 1256848916 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1256848916 -0700

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

Merge commit '859b3a7453c7b631a34acde4df9bdca680967520' into eclair-mr2

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