tree 46bd1577e9e28e01a6bfa4b88b684c60fa97b0bd
parent 26a16c24d72194c7a85b66cb4f90756ec4fb4597
parent fa7969fbd587d8eb2e43093a83fcad85e2b91726
author Michael Jurka <mikejurka@google.com> 1348272518 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348272518 -0700

am fa7969fb: Fix NPE

* commit 'fa7969fbd587d8eb2e43093a83fcad85e2b91726':
  Fix NPE