From 8665767aa59fc0d90b4f40f59b4a4420277a6fa5 Mon Sep 17 00:00:00 2001
From: Richard Belleville <rbellevi@google.com>
Date: Tue, 26 Feb 2019 13:12:53 -0800
Subject: [PATCH] Fix bad merge

---
 src/python/grpcio/grpc/_server.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/python/grpcio/grpc/_server.py b/src/python/grpcio/grpc/_server.py
index e1da3e5b4d3..90136aef3c2 100644
--- a/src/python/grpcio/grpc/_server.py
+++ b/src/python/grpcio/grpc/_server.py
@@ -303,6 +303,9 @@ class _Context(grpc.ServicerContext):
         with self._state.condition:
             self._state.details = _common.encode(details)
 
+    def _finalize_state(self):
+        pass
+
 
 class _RequestIterator(object):