tree 129cecc7ea7a1e443c91dc4bc0c6e90ae4aa9203
parent cae7f573de57a13972a6a215484356f6b4779382
author Adam Cohen <adamcohen@google.com> 1383616656 -0800
committer Adam Cohen <adamcohen@google.com> 1383616695 -0800

Fix bug where cancelling config activity leaves user stuck in bad state

Change-Id: I774cc6e46006f623c97812c85023b228128430fe