| commit | 5fb0a60d55526cf8426f81d60229af56b1a54fb3 | [log] [tgz] |
|---|---|---|
| author | Adam Cohen <adamcohen@google.com> | Fri Feb 14 20:37:32 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 14 20:37:32 2014 +0000 |
| tree | 561a1a72546333fb69bb9fada7062aa065f31018 | |
| parent | 9a088cb860bd79c137f5cdffe696f7645663b654 [diff] | |
| parent | f52d5de90507bad7cf1bc35acb9862ea314f03d8 [diff] |
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