diff options
| author |  David Garcia Quintas <dgq@google.com> | 2016-03-31 09:43:03 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2016-03-31 09:43:03 -0700 |
| commit | 2877d7398e9f6bf815af3f42f21cb4c3d917be2e (patch) | |
| tree | 7a08a3e544cf8583d4bb2405bb53e48ebdac5a65 /src/cpp/client/channel.cc | |
| parent | 2c73b22885ea07ecd338e71a0baf5cdcfc45605a (diff) | |
| parent | 2b9012362ca03181eefaec22238c6100e77bb736 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into lb_resolvers
Diffstat (limited to 'src/cpp/client/channel.cc')
| -rw-r--r-- | src/cpp/client/channel.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cpp/client/channel.cc b/src/cpp/client/channel.cc index ae20392d11..f174676172 100644 --- a/src/cpp/client/channel.cc +++ b/src/cpp/client/channel.cc @@ -49,7 +49,7 @@ #include <grpc/grpc.h> #include <grpc/support/log.h> #include <grpc/support/slice.h> -#include "src/core/profiling/timers.h" +#include "src/core/lib/profiling/timers.h" namespace grpc { |