tree c65e44dad409fe83f79ed235563e2e6d980c59a4
parent cdc4414e80aca6ea568263f657156db229109673
parent 8d983a4251243a7735bea23ec3d030012cbfcb47
author Joe Onorato <joeo@android.com> 1255659897 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1255659897 -0700

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

Merge commit '8d983a4251243a7735bea23ec3d030012cbfcb47'

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