aboutsummaryrefslogtreecommitdiff
path: root/protobuf-nano
diff options
context:
space:
mode:
authorKun Zhang <zhangkun@google.com>2015-08-10 17:37:28 -0700
committerKun Zhang <zhangkun@google.com>2015-08-11 10:53:38 -0700
commitf681b5f8beef3f36508edc61cdc79cb0399b348d (patch)
treeeb0486ea76e697c26b64d390795664790281126d /protobuf-nano
parentddea7435c9952e4ee8ecaf8f52bda6733a7bc824 (diff)
downloadgrpc-grpc-java-f681b5f8beef3f36508edc61cdc79cb0399b348d.tar.gz
Move Marshaller into MethodDescriptor
Diffstat (limited to 'protobuf-nano')
-rw-r--r--protobuf-nano/src/main/java/io/grpc/protobuf/nano/NanoUtils.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/protobuf-nano/src/main/java/io/grpc/protobuf/nano/NanoUtils.java b/protobuf-nano/src/main/java/io/grpc/protobuf/nano/NanoUtils.java
index ddd9630d5..300f50c52 100644
--- a/protobuf-nano/src/main/java/io/grpc/protobuf/nano/NanoUtils.java
+++ b/protobuf-nano/src/main/java/io/grpc/protobuf/nano/NanoUtils.java
@@ -35,7 +35,7 @@ import com.google.common.io.ByteStreams;
import com.google.protobuf.nano.CodedInputByteBufferNano;
import com.google.protobuf.nano.MessageNano;
-import io.grpc.Marshaller;
+import io.grpc.MethodDescriptor.Marshaller;
import io.grpc.Status;
import java.io.IOException;