tree 89e0113de5aa7ce3dffea0704e55556854e088f0
parent 27696303e8e8bebbeff0faf876b215ed3ca11ead
parent c4d46df70d525cb2289bd76fb0b0b12637dbbe23
author Alice Yang <alice@google.com> 1362436341 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1362436341 -0800

am c4d46df7: Fix NPE.

* commit 'c4d46df70d525cb2289bd76fb0b0b12637dbbe23':
  Fix NPE.