| Index: build/android/pylib/instrumentation/test_runner.py | 
| diff --git a/build/android/pylib/instrumentation/test_runner.py b/build/android/pylib/instrumentation/test_runner.py | 
| index 5fa11357314c68ef718169a221f20cd761fbfe1e..5bb5ac2f19dac781211c74354fc9b8c0043ad45a 100644 | 
| --- a/build/android/pylib/instrumentation/test_runner.py | 
| +++ b/build/android/pylib/instrumentation/test_runner.py | 
| @@ -159,7 +159,7 @@ class TestRunner(base_test_runner.BaseTestRunner): | 
| def TearDown(self): | 
| """Cleans up the test harness and saves outstanding data from test run.""" | 
| if self.ports_to_forward: | 
| -      self._UnmapPortPairs(self.ports_to_forward) | 
| +      self._UnmapPorts([(port, port) for port in self.ports_to_forward]) | 
| super(TestRunner, self).TearDown() | 
|  | 
| def TestSetup(self, test): | 
|  |