| commit | 39de38d349d0c4c0422a3c9f631d72171b76cb06 | [log] [tgz] |
|---|---|---|
| author | Adam Cohen <adamcohen@google.com> | Thu Oct 23 17:30:42 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 23 17:30:42 2014 +0000 |
| tree | cba62d0d64153aa2169651696bc238591341d679 | |
| parent | 082d41ce10b75c9c29ae6c88e7fea679f3b77297 [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':