diff options
author | 2018-02-08 15:18:13 -0800 | |
---|---|---|
committer | 2018-02-08 15:18:13 -0800 | |
commit | 0693b72b7fdf7927ad120319ce53b4cf78cc11c9 (patch) | |
tree | 9af4eeefbf4e7c98ccd5264eb7280a26f637e18c /src/core/lib/iomgr/timer_generic.cc | |
parent | 5122487fad891fdf5560122285c1690a06df73d2 (diff) | |
parent | bf19c3332161b26f3942ed7b3a711bdc4dd923bc (diff) |
Merge branch 'master' into gpr_review
Diffstat (limited to 'src/core/lib/iomgr/timer_generic.cc')
-rw-r--r-- | src/core/lib/iomgr/timer_generic.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/lib/iomgr/timer_generic.cc b/src/core/lib/iomgr/timer_generic.cc index 5d0fcdea4f..ef86d237d3 100644 --- a/src/core/lib/iomgr/timer_generic.cc +++ b/src/core/lib/iomgr/timer_generic.cc @@ -29,10 +29,10 @@ #include <grpc/support/log.h> #include <grpc/support/string_util.h> #include <grpc/support/sync.h> -#include <grpc/support/tls.h> #include "src/core/lib/debug/trace.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/time_averaged_stats.h" #include "src/core/lib/iomgr/timer_heap.h" |