tree 3b70e799a19c47416be838ff188d27964d56e055
parent 2d439e62a7eb16416af440b1cf1c03a615b6a0ce
parent f3fe6820927d335f09c27e026702d2b0d4a69923
author Michael Jurka <mikejurka@google.com> 1295229404 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295229404 -0800

am f3fe6820: Merge "NPE fix" into honeycomb

* commit 'f3fe6820927d335f09c27e026702d2b0d4a69923':
  NPE fix