OSDN Git Service

am 3ed1461d: (-s ours) am f088ef91: (-s ours) Reconcile with jb-mr2-zeroday-deb-relea...
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 13 Aug 2013 17:16:32 +0000 (10:16 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 Aug 2013 17:16:32 +0000 (10:16 -0700)
commit6f388a8ac212fd559f64ad5a938874d48e4dc85a
tree3dc59832e465383ac1720789b9d7c64f7832bec9
parentb318ddd2ca6ece875dd028d5dac3a1a82bec1751
parent3ed1461d3589a38e162414e50371c621ea17e591
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.