tree c65e44dad409fe83f79ed235563e2e6d980c59a4
parent 9dd000dfacca062936f1c20f43a8e10c70eb768b
parent 68ffd10dfcc7913082183d23949df25c23001e6c
author Joe Onorato <joeo@android.com> 1255658835 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1255658835 -0700

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

Merge commit '68ffd10dfcc7913082183d23949df25c23001e6c' into eclair-mr2

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