diff options
author | Muxi Yan <mxyan@google.com> | 2018-01-19 12:20:15 -0800 |
---|---|---|
committer | Muxi Yan <mxyan@google.com> | 2018-01-19 12:20:15 -0800 |
commit | fb061c329ac5086b62619b118191574f3fd27a79 (patch) | |
tree | 6a855770d7218425a2cd53bc378800c30d6c8525 /src/core/lib/transport/timeout_encoding.h | |
parent | 032e9b32dc5978a042bdda5c3031ae6cbd928973 (diff) | |
parent | 9813858908da2e7deaa58d91f4030e6881e364e3 (diff) |
Merge remote-tracking branch 'upstream/master' into fix-stream-compression-config-interface
Diffstat (limited to 'src/core/lib/transport/timeout_encoding.h')
-rw-r--r-- | src/core/lib/transport/timeout_encoding.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/lib/transport/timeout_encoding.h b/src/core/lib/transport/timeout_encoding.h index 8611f49b00..4e9268262e 100644 --- a/src/core/lib/transport/timeout_encoding.h +++ b/src/core/lib/transport/timeout_encoding.h @@ -22,8 +22,8 @@ #include <grpc/slice.h> #include <grpc/support/time.h> +#include "src/core/lib/gpr/string.h" #include "src/core/lib/iomgr/exec_ctx.h" -#include "src/core/lib/support/string.h" #define GRPC_HTTP2_TIMEOUT_ENCODE_MIN_BUFSIZE (GPR_LTOA_MIN_BUFSIZE + 1) |