tree 30718451701c90294b696f521384708e8113806a
parent 0c1eeac3360ee0f06a34701d9ae92ae1e88d1c4d
parent 2fe1530ce9ab8c8a48aed7df62c771e774df23a7
author Michael Jurka <mikejurka@google.com> 1380915532 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380915532 -0700

am 2fe1530c: Fix NPE

* commit '2fe1530ce9ab8c8a48aed7df62c771e774df23a7':
  Fix NPE