From: Lorenzo Colitti <lorenzo@google.com>
Date: Tue, 27 Oct 2015 06:35:49 +0000 (+0000)
Subject: Merge "Make tcp_nuke_addr_test pass when run more than once." am: 2e3fb5e458
X-Git-Tag: android-x86-7.1-r1~133^2~28
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d5ede472c0;p=android-x86%2Fsystem-extras.git

Merge "Make tcp_nuke_addr_test pass when run more than once." am: 2e3fb5e458
am: e572b5a4ae

* commit 'e572b5a4ae5df0023c258381618dbcedf95d805c':
  Make tcp_nuke_addr_test pass when run more than once.
---

d5ede472c0068953880d17b71735b3521fa1c91e