tree 4022bb3e6cf8f6333aa7441fc33d203a1666bfbf
parent c0dfb140c3b11b67f22fd4ae28f688ccab4429b1
parent d120e994f63dfed8032a5c91ce3b8334d82646c6
author Adam Cohen <adamcohen@google.com> 1383632761 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383632761 -0800

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

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