tree 85273d4780bd1dfd5353fbdc8af310541513f1d2
parent e1aca55ccc01a0064a9054c1cba03648158e26c0
parent c60498a91d82ca7d73402d5a5dd8467cd7e0391c
author Michael Jurka <mikejurka@google.com> 1336514490 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336514490 -0700

am c60498a9: Fix NPE

* commit 'c60498a91d82ca7d73402d5a5dd8467cd7e0391c':
  Fix NPE