From ba4290a82d9f1e59c614f786930d6d2fc86a6bce Mon Sep 17 00:00:00 2001
From: David Garcia Quintas <dgq@google.com>
Date: Fri, 23 Oct 2015 15:20:48 -0700
Subject: [PATCH] Removed 'using' conflicting with import

---
 test/cpp/interop/stress_test.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/cpp/interop/stress_test.cc b/test/cpp/interop/stress_test.cc
index 91ef92af378..a1f67808092 100644
--- a/test/cpp/interop/stress_test.cc
+++ b/test/cpp/interop/stress_test.cc
@@ -80,10 +80,10 @@ DEFINE_string(test_cases, "",
 
 using std::make_pair;
 using std::pair;
-using std::string;
 using std::thread;
 using std::vector;
 
+using grpc::string;
 using grpc::testing::kTestCaseList;
 using grpc::testing::StressTestInteropClient;
 using grpc::testing::TestCaseType;