commit d5b0455110b834c7fa102a0338882a4f98d31ae8
author murgatroid99 <mlumish@google.com> Thu Jun 15 17:48:42 2017 -0700
committer murgatroid99 <mlumish@google.com> Thu Jun 15 17:48:42 2017 -0700
tree dcc9789852f362a5986709587475aee4822cd350
parent fb5ad8d2b9b5fc541a3a85703783fe8e7e4ee91b
parent 2f850801235580217bb74c5911686bce0374dcad

Merge remote-tracking branch 'upstream/v1.4.x' into upmerge_1.4.x

BUILD

diff --git a/BUILD b/BUILD
index 04dba30..495bb66 100644
--- a/BUILD
+++ b/BUILD
@@ -930,8 +930,8 @@
     deps = [
         "grpc_base",
         "grpc_client_channel",
-        "grpc_secure",
         "grpc_resolver_fake",
+        "grpc_secure",
     ],
 )
 
@@ -1025,8 +1025,8 @@
     name = "grpc_resolver_fake",
     srcs = ["src/core/ext/filters/client_channel/resolver/fake/fake_resolver.c"],
     hdrs = ["src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h"],
-    visibility = ["//test:__subpackages__"],
     language = "c",
+    visibility = ["//test:__subpackages__"],
     deps = [
         "grpc_base",
         "grpc_client_channel",