tree 5972dd80e5208a5d32257595bc6f311bbf654343
parent 1af62de474e746683c81358a520c85c7c0ed4a81
parent 2e9cef068501643d82bb4eca20aedaea79ccc600
author Andy Huang <ath@google.com> 1363394857 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1363394857 +0000

am 2e9cef06: fix NPE

* commit '2e9cef068501643d82bb4eca20aedaea79ccc600':
  fix NPE