tree 9cf1ca0385138d0a8d6af3c7dba8363f3cce77d4
parent 11ef746c5b20dc5be271435e8d2807a8bc22738e
parent 2561ee8453dc41a9d65f7890ea227416d7e8948c
author Michael Jurka <mikejurka@google.com> 1340055786 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340055786 -0700

am 2561ee84: am d74389d9: Merge "Add null pointer checks to fix NPEs" into jb-dev

* commit '2561ee8453dc41a9d65f7890ea227416d7e8948c':
  Add null pointer checks to fix NPEs