tree 55498ff42a7a8142ffe0a9b04766784298fc328c
parent 4d3551052a5fc71ce912537daa28a6e96b62c0fa
parent 539ed9dfee12564f0bf43822481c7a9b81e5d8b7
author Joe Onorato <joeo@android.com> 1255371920 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1255371920 -0700

am 539ed9df: PASSION ONLY - fix npe

Merge commit '539ed9dfee12564f0bf43822481c7a9b81e5d8b7'

* commit '539ed9dfee12564f0bf43822481c7a9b81e5d8b7':
  PASSION ONLY - fix npe