| commit | 669a3fea4147158840a936b332c328076aa5104e | [log] [tgz] |
|---|---|---|
| author | Adam Cohen <adamcohen@google.com> | Fri Feb 14 21:00:56 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 14 21:00:56 2014 +0000 |
| tree | dbdb54615734826d04a39df415fd29e667708ded | |
| parent | e994e4a1ffccac5d3ba08eecbb5bdcaa2792fc61 [diff] | |
| parent | dc90f62fa6cb91e5abe19f69a031399326e11068 [diff] |
am dc90f62f: 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 'dc90f62fa6cb91e5abe19f69a031399326e11068': Fix bug where cancelling config activity leaves user stuck in bad state