Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Bazel: Automatically fix lint errors with buildifier 0.20.0
  Bazel: Fix more buildifier warnings
  Bazel: Automatically fix lint errors with buildifier 0.20.0
  Fix typo in documentation of edit preferences
  Bazel: Automatically fix lint errors with buildifier

Change-Id: I3400928e4dca65264715dca3c29729237934f042

1 files changed, 5 insertions, 5 deletions

diff --git a/BUILD b/BUILD
index 0b528d8bf8..cedc077c87 100644
--- a/BUILD
+++ b/BUILD
@@ -1,11 +1,9 @@
-package(default_visibility = ["//visibility:public"])
-
-load("//tools/bzl:genrule2.bzl", "genrule2")
-load("//tools/bzl:pkg_war.bzl", "pkg_war")
 load(
     "@bazel_tools//tools/jdk:default_java_toolchain.bzl",
     "default_java_toolchain",
 )
+load("//tools/bzl:genrule2.bzl", "genrule2")
+load("//tools/bzl:pkg_war.bzl", "pkg_war")
 
 config_setting(
     name = "java9",
@@ -35,8 +33,8 @@ config_setting(
 java_runtime(
     name = "absolute_javabase",
     java_home = select({
-        ":use_absolute_javabase": "$(ABSOLUTE_JAVABASE)",
         "//conditions:default": "",
+        ":use_absolute_javabase": "$(ABSOLUTE_JAVABASE)",
     }),
     visibility = ["//visibility:public"],
 )
@@ -51,6 +49,8 @@ default_java_toolchain(
     jvm_opts = [],
 )
 
+package(default_visibility = ["//visibility:public"])
+
 genrule(
     name = "gen_version",
     outs = ["version.txt"],