| commit | d3bd1707bb284e7ae322306a544dd915d172e0d5 | [log] [tgz] |
|---|---|---|
| author | Adam Cohen <adamcohen@google.com> | Wed Oct 29 07:05:30 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 07:05:30 2014 +0000 |
| tree | 10da860fcff71886af91d082e31f0e1917926848 | |
| parent | bb05a27e7bd42b0bfd4d9c7f22a1257a475284a6 [diff] | |
| parent | 39de38d349d0c4c0422a3c9f631d72171b76cb06 [diff] |
am 39de38d3: 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 '39de38d349d0c4c0422a3c9f631d72171b76cb06':