OSDN Git Service

am 5fb0a60d: am f52d5de9: am d120e994: am c18e4a92: Merge "Fix bug where cancelling...
authorAdam Cohen <adamcohen@google.com>
Fri, 14 Feb 2014 20:53:01 +0000 (20:53 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 Feb 2014 20:53:01 +0000 (20:53 +0000)
commitdc90f62fa6cb91e5abe19f69a031399326e11068
treedbdb54615734826d04a39df415fd29e667708ded
parent7bcf2eaff665ccb55f3ab260f6967cb5a6c9511f
parent5fb0a60d55526cf8426f81d60229af56b1a54fb3
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 '5fb0a60d55526cf8426f81d60229af56b1a54fb3':
  Fix bug where cancelling config activity leaves user stuck in bad state