tree 1cfb394d6928dc2d9f9770188aa716b14eadc9f4
parent 8ef6618d5e767441846f8865c812e8ff6e961ef2
parent d74389d9027a128da85be151670ee43e55feaba5
author Michael Jurka <mikejurka@google.com> 1340055620 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340055620 -0700

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

* commit 'd74389d9027a128da85be151670ee43e55feaba5':
  Add null pointer checks to fix NPEs