tree 9bdf69183a592cd7afa75c7a1c9bd8cbe8e636de
parent 8ede04dbd5c09fa6a350e7af2aa49a0bde71725b
parent 48ad5213e18a67b3a7ec3375214e3900240b889c
author Alice Yang <alice@google.com> 1362516994 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1362516994 +0000

am 48ad5213: Fix NPE.

* commit '48ad5213e18a67b3a7ec3375214e3900240b889c':
  Fix NPE.