| commit | 6f388a8ac212fd559f64ad5a938874d48e4dc85a | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Aug 13 10:16:32 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 13 10:16:32 2013 -0700 |
| tree | 3dc59832e465383ac1720789b9d7c64f7832bec9 | |
| parent | b318ddd2ca6ece875dd028d5dac3a1a82bec1751 [diff] | |
| parent | 3ed1461d3589a38e162414e50371c621ea17e591 [diff] |
am 3ed1461d: (-s ours) am f088ef91: (-s ours) Reconcile with jb-mr2-zeroday-deb-release - do not merge * commit '3ed1461d3589a38e162414e50371c621ea17e591': Restart, cleanup or retry inactve connections.