tree b082a8957b717e041894d3818d8798962a08b3cc
parent e33f825908a02fc6fa4d4054672b3bbd7708427e
parent c18e4a926530cf458bdc67abfdd60488ff62d758
author Adam Cohen <adamcohen@google.com> 1383617699 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383617699 -0800

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

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