tree fece4076cf714e9354753c9b4800ef2975e2ed4f
parent deb315397bf7d23142a0df02a812504385f0e7b7
parent 840ebf6277c8eea38b6a4f03cd8bb4e09bd69c7d
author Michael Jurka <mikejurka@google.com> 1335474295 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1335474295 -0700

am 840ebf62: Merge "Fix NPE" into jb-dev

* commit '840ebf6277c8eea38b6a4f03cd8bb4e09bd69c7d':
  Fix NPE