tree dbdb54615734826d04a39df415fd29e667708ded
parent 7bcf2eaff665ccb55f3ab260f6967cb5a6c9511f
parent 5fb0a60d55526cf8426f81d60229af56b1a54fb3
author Adam Cohen <adamcohen@google.com> 1392411181 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411181 +0000

am 5fb0a60d: am f52d5de9: am d120e994: am c18e4a92: Merge "Fix bug where cancelling config activity leaves user stuck in bad state" into jb-ub-now-jetsonic

* commit '5fb0a60d55526cf8426f81d60229af56b1a54fb3':
  Fix bug where cancelling config activity leaves user stuck in bad state