Merge b6e5956 into b83742d

grpc · Aug 20, 2015 · 693152f · 693152f
2 parents b83742d + b6e5956
commit 693152f
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/core/src/main/java/io/grpc/CallOptions.java b/core/src/main/java/io/grpc/CallOptions.java
@@ -32,7 +32,6 @@
 package io.grpc;
 
 import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
 
 import io.grpc.MessageEncoding.Compressor;
 
@@ -125,7 +124,7 @@ private CallOptions(CallOptions other) {
   @SuppressWarnings("deprecation") // guava 14.0
   @Override
   public String toString() {
-    ToStringHelper toStringHelper = Objects.toStringHelper(this);
+    Objects.ToStringHelper toStringHelper = Objects.toStringHelper(this);
     toStringHelper.add("deadlineNanoTime", deadlineNanoTime);
     if (deadlineNanoTime != null) {
       long remainingNanos = deadlineNanoTime - System.nanoTime();