diff options
| author |  Vijay Pai <vpai@google.com> | 2018-02-08 15:18:13 -0800 |
|---|---|---|
| committer | Vijay Pai <vpai@google.com> | 2018-02-08 15:18:13 -0800 |
| commit | 0693b72b7fdf7927ad120319ce53b4cf78cc11c9 (patch) | |
| tree | 9af4eeefbf4e7c98ccd5264eb7280a26f637e18c /src/core/lib/iomgr/executor.cc | |
| parent | 5122487fad891fdf5560122285c1690a06df73d2 (diff) | |
| parent | bf19c3332161b26f3942ed7b3a711bdc4dd923bc (diff) | |
Merge branch 'master' into gpr_review
Diffstat (limited to 'src/core/lib/iomgr/executor.cc')
| -rw-r--r-- | src/core/lib/iomgr/executor.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/lib/iomgr/executor.cc b/src/core/lib/iomgr/executor.cc index ca67c043c1..3288ea3de5 100644 --- a/src/core/lib/iomgr/executor.cc +++ b/src/core/lib/iomgr/executor.cc @@ -25,10 +25,10 @@ #include <grpc/support/log.h> #include <grpc/support/sync.h> #include <grpc/support/thd.h> -#include <grpc/support/tls.h> #include "src/core/lib/debug/stats.h" #include "src/core/lib/gpr/spinlock.h" +#include "src/core/lib/gpr/tls.h" #include "src/core/lib/gpr/useful.h" #include "src/core/lib/iomgr/exec_ctx.h" |