tree 158677fcc577bae3e97246bbd8c045498e598316
parent 4ed497a30d75561201b86ba5d3fcdbfdb7fb6ca2
parent 7c3fc128913ae22b15478c086c07b36aa7fd51e6
author Justin Klaassen <justinklaassen@google.com> 1409096139 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409096139 +0000

am 7c3fc128: am 2c82a585: am f79d6f69: Fix NPE resulting from invalid instance state

* commit '7c3fc128913ae22b15478c086c07b36aa7fd51e6':
  Fix NPE resulting from invalid instance state