tree 3a6dac0856319f84456397cd2a883ed781fe6be4
parent 41898f44fdc3ed435c9b264c6b88c9ae7dd5ada5
parent f79d6f699b04a735e1627b47a059760ff40c26b9
author Justin Klaassen <justinklaassen@google.com> 1409094919 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409094919 +0000

am f79d6f69: Fix NPE resulting from invalid instance state

* commit 'f79d6f699b04a735e1627b47a059760ff40c26b9':
  Fix NPE resulting from invalid instance state