tree 7f27de590b92375c07899038b25018be976743fd
parent bc5fb26739922e1a3a04f1c2faf5aefae54773b9
parent 9160410e40c8e060a7012a35b38f2532fa159084
author Michael Jurka <mikejurka@google.com> 1350663194 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350663194 -0700

am 9160410e: am eb91462f: am d6dd7c8a: Fix NPE

* commit '9160410e40c8e060a7012a35b38f2532fa159084':
  Fix NPE