From cc09eab9afdb676783e4771c1a82d0888edd674d Mon Sep 17 00:00:00 2001
From: Spencer Fang <spencerfang@google.com>
Date: Wed, 19 Sep 2018 12:45:13 -0700
Subject: [PATCH] core: fix channelz import on
 AutoConfiguredLoadBalancerFactory

The original PR was stale when merged.
---
 .../io/grpc/internal/AutoConfiguredLoadBalancerFactory.java   | 2 +-
 .../grpc/internal/AutoConfiguredLoadBalancerFactoryTest.java  | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/io/grpc/internal/AutoConfiguredLoadBalancerFactory.java b/core/src/main/java/io/grpc/internal/AutoConfiguredLoadBalancerFactory.java
index ce063bd790..a8f778a46b 100644
--- a/core/src/main/java/io/grpc/internal/AutoConfiguredLoadBalancerFactory.java
+++ b/core/src/main/java/io/grpc/internal/AutoConfiguredLoadBalancerFactory.java
@@ -23,6 +23,7 @@ import io.grpc.Attributes;
 import io.grpc.ConnectivityState;
 import io.grpc.ConnectivityStateInfo;
 import io.grpc.EquivalentAddressGroup;
+import io.grpc.InternalChannelz.ChannelTrace;
 import io.grpc.LoadBalancer;
 import io.grpc.LoadBalancer.Helper;
 import io.grpc.LoadBalancer.PickResult;
@@ -30,7 +31,6 @@ import io.grpc.LoadBalancer.PickSubchannelArgs;
 import io.grpc.LoadBalancer.SubchannelPicker;
 import io.grpc.PickFirstBalancerFactory;
 import io.grpc.Status;
-import io.grpc.internal.Channelz.ChannelTrace;
 import java.lang.reflect.Method;
 import java.util.List;
 import java.util.Locale;
diff --git a/core/src/test/java/io/grpc/internal/AutoConfiguredLoadBalancerFactoryTest.java b/core/src/test/java/io/grpc/internal/AutoConfiguredLoadBalancerFactoryTest.java
index 9853b4b05d..71c574298d 100644
--- a/core/src/test/java/io/grpc/internal/AutoConfiguredLoadBalancerFactoryTest.java
+++ b/core/src/test/java/io/grpc/internal/AutoConfiguredLoadBalancerFactoryTest.java
@@ -26,6 +26,7 @@ import io.grpc.Attributes;
 import io.grpc.ConnectivityState;
 import io.grpc.ConnectivityStateInfo;
 import io.grpc.EquivalentAddressGroup;
+import io.grpc.InternalChannelz;
 import io.grpc.LoadBalancer;
 import io.grpc.LoadBalancer.Helper;
 import io.grpc.LoadBalancer.Subchannel;
@@ -271,7 +272,8 @@ public class AutoConfiguredLoadBalancerFactoryTest {
       }
     };
 
-    Channelz.ChannelStats.Builder statsBuilder = new Channelz.ChannelStats.Builder();
+    InternalChannelz.ChannelStats.Builder statsBuilder
+        = new InternalChannelz.ChannelStats.Builder();
     channelTracer.updateBuilder(statsBuilder);
     List<EquivalentAddressGroup> servers =
         Collections.singletonList(