tree 1bee1b36401728bb4ca4c1f530b7b8d05f3508c6
parent c00056961faf2e2541f841107c0c6db6efed7e3f
parent bd698cd0f7689615bc53296342173c4817a0fb21
author Alice Yang <alice@google.com> 1378279828 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1378279828 -0700

am bd698cd0: Merge "Revert "Revert "Prevent an NPE""" into jb-ub-mail-ur10

* commit 'bd698cd0f7689615bc53296342173c4817a0fb21':
  Revert "Revert "Prevent an NPE""