diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2018-01-19 08:17:29 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-01-19 08:17:29 +0100 |
| commit | 461cf30159c0ada954e8e2a4e6591694f617809c (patch) | |
| tree | 6c0f2b9cfe328d0ed724700449f39e709915b3bd /src/core/lib/security/credentials/credentials.cc | |
| parent | 471a5dc18b4465b051cddf4e02dbdf44336f80ce (diff) | |
| parent | bb2f7e28edc3e3dd663ad308aed7ed632a0a17bf (diff) | |
Merge branch 'master' into cmake-export-fix
Diffstat (limited to 'src/core/lib/security/credentials/credentials.cc')
| -rw-r--r-- | src/core/lib/security/credentials/credentials.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/lib/security/credentials/credentials.cc b/src/core/lib/security/credentials/credentials.cc index 48b459e1be..009a5ce4ec 100644 --- a/src/core/lib/security/credentials/credentials.cc +++ b/src/core/lib/security/credentials/credentials.cc @@ -22,11 +22,11 @@ #include <string.h> #include "src/core/lib/channel/channel_args.h" +#include "src/core/lib/gpr/string.h" #include "src/core/lib/http/httpcli.h" #include "src/core/lib/http/parser.h" #include "src/core/lib/iomgr/executor.h" #include "src/core/lib/json/json.h" -#include "src/core/lib/support/string.h" #include "src/core/lib/surface/api_trace.h" #include <grpc/support/alloc.h> |