tree f0bddb4857ef50d8052c0d5397bc5721b208b228
parent dde9559b78a93344ec0b568c2bac7329621de31f
parent 58156b4123acf92f2a03885136a3b6859801f000
author Carlos Valdivia <carlosvaldivia@google.com> 1366400819 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366400819 -0700

am 58156b41: Merge "Fix NPE when restarting ChooseTypeAndAccountActiivty." into jb-mr2-dev

* commit '58156b4123acf92f2a03885136a3b6859801f000':
  Fix NPE when restarting ChooseTypeAndAccountActiivty.