tree dbdb54615734826d04a39df415fd29e667708ded
parent e994e4a1ffccac5d3ba08eecbb5bdcaa2792fc61
parent dc90f62fa6cb91e5abe19f69a031399326e11068
author Adam Cohen <adamcohen@google.com> 1392411656 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411656 +0000

am dc90f62f: 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 'dc90f62fa6cb91e5abe19f69a031399326e11068':
  Fix bug where cancelling config activity leaves user stuck in bad state