tree c65e44dad409fe83f79ed235563e2e6d980c59a4
parent 741c73158cfd6bfccdcff72f12a0c9a985f2dcf1
parent b968a73f55a3c4ad82079dcedc3e27361ba5c657
author Joe Onorato <joeo@android.com> 1255659287 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1255659287 -0700

am b968a73f: am 68ffd10d: Passion - Maybe this will fix bug 2183130 - NPE in AllAppsView.onTouchEvent.

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

* commit 'b968a73f55a3c4ad82079dcedc3e27361ba5c657':
  Passion - Maybe this will fix bug 2183130 - NPE in AllAppsView.onTouchEvent.