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