diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-03-28 08:29:05 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-03-28 08:29:05 -0700 |
| commit | 9d77ed5e2df5eabed41e0acac511d2f2edff3aad (patch) | |
| tree | 51355e20b28e7515cc90922e2e3f3e0399992f9a /src/core/channel/channel_args.c | |
| parent | ef37d7cd4eee37689380e727a268fbb06f286fcb (diff) | |
| parent | 94f908ae84ab6d280a41e09245925ecfa612dce8 (diff) | |
Merge github.com:grpc/grpc into accounting
Diffstat (limited to 'src/core/channel/channel_args.c')
| -rw-r--r-- | src/core/channel/channel_args.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/channel/channel_args.c b/src/core/channel/channel_args.c index bae7a90a01..e0382fa0d9 100644 --- a/src/core/channel/channel_args.c +++ b/src/core/channel/channel_args.c @@ -31,8 +31,8 @@ * */ -#include <grpc/grpc.h> #include "src/core/channel/channel_args.h" +#include <grpc/grpc.h> #include "src/core/support/string.h" #include <grpc/census.h> |