tree 5e880cb26b8b8c6cdaf765d9c84cfd526a07560b
parent 172b1e24a3f2d775f7721ff33751773a59c68a4d
parent b5e94ccacfaf54062f2e9460236917c5cbdf33c8
author Joe Onorato <joeo@android.com> 1256849775 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1256849775 -0700

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

Merge commit 'b5e94ccacfaf54062f2e9460236917c5cbdf33c8' into eclair-mr2-plus-aosp

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