tree 561a1a72546333fb69bb9fada7062aa065f31018
parent 9a088cb860bd79c137f5cdffe696f7645663b654
parent f52d5de90507bad7cf1bc35acb9862ea314f03d8
author Adam Cohen <adamcohen@google.com> 1392410252 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410252 +0000

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