Merge branch 'master' of https://github.com/grpc/grpc into cpp_stress…

…_flags
pmarks-net · Jan 19, 2017 · c51f19d · c51f19d
2 parents 9c7a08d + a52c262
commit c51f19d
Show file tree

Hide file tree

Showing 55 changed files with 10,706 additions and 1,232 deletions.
diff --git a/BUILD b/BUILD
@@ -1027,7 +1027,7 @@ grpc_cc_library(
         "src/core/ext/transport/cronet/transport/cronet_transport.c",
     ],
     hdrs = [
-        "third_party/objective_c/Cronet/cronet_c_for_grpc.h",
+        "third_party/Cronet/bidirectional_stream_c.h",
     ],
     language = "c",
     public_hdrs = [