tree de87ddce603863bda5d425d219a6f6dda30a9f03
parent eb91462f087028e2ce22552ba8ce4e17b9a4f9c1
parent 964e2a63c29ed81c2dbd82a3386fda2af7d4662c
author Michael Jurka <mikejurka@google.com> 1350662938 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350662938 -0700

am 964e2a63: Merge "Fix NPE" into jb-mr1-dev

* commit '964e2a63c29ed81c2dbd82a3386fda2af7d4662c':
  Fix NPE