tree 3a6dac0856319f84456397cd2a883ed781fe6be4
parent 1d9261df10e296888f5b55ed984e6ebb6c28cb62
parent 2c82a58551dabc42238466db29eae5e1ddfdc3de
author Justin Klaassen <justinklaassen@google.com> 1409095555 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409095555 +0000

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

* commit '2c82a58551dabc42238466db29eae5e1ddfdc3de':
  Fix NPE resulting from invalid instance state