Automatic formatting cleanup of Android *.java files.

RELNOTES: None.
PiperOrigin-RevId: 179425421

1 files changed, 7 insertions, 8 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/ResourceApk.java b/src/main/java/com/google/devtools/build/lib/rules/android/ResourceApk.java
index 4f244bd683..a4980cf040 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/ResourceApk.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/ResourceApk.java
@@ -27,12 +27,12 @@ public final class ResourceApk {
   // TODO(bazel-team): The only fields that are legitimately nullable are javaSrcJar and
   // mainDexProguardConfig. The rest are marked as such due to .fromTransitiveResources().
   // It seems like there should be a better way to do this.
-  @Nullable private final Artifact resourceApk;  // The .ap_ file
-  @Nullable private final Artifact resourceJavaSrcJar;  // Source jar containing R.java and friends
-  @Nullable private final Artifact resourceJavaClassJar;  // Class jar containing R.class files
+  @Nullable private final Artifact resourceApk; // The .ap_ file
+  @Nullable private final Artifact resourceJavaSrcJar; // Source jar containing R.java and friends
+  @Nullable private final Artifact resourceJavaClassJar; // Class jar containing R.class files
   private final ResourceDependencies resourceDeps;
   @Nullable private final ResourceContainer primaryResource;
-  @Nullable private final Artifact manifest;  // The non-binary XML version of AndroidManifest.xml
+  @Nullable private final Artifact manifest; // The non-binary XML version of AndroidManifest.xml
   @Nullable private final Artifact resourceProguardConfig;
   @Nullable private final Artifact mainDexProguardConfig;
   private final boolean legacy;
@@ -82,8 +82,7 @@ public final class ResourceApk {
     return legacy;
   }
 
-  public static ResourceApk fromTransitiveResources(
-      ResourceDependencies resourceDeps) {
+  public static ResourceApk fromTransitiveResources(ResourceDependencies resourceDeps) {
     return new ResourceApk(null, null, null, resourceDeps, null, null, null, null, false);
   }
 
@@ -109,8 +108,8 @@ public final class ResourceApk {
    * <p>If the ResourceApk was generated from a "resources" attribute, it will contain the
    * "resources" container in the direct dependencies and the rest as transitive.
    *
-   * <p>If the ResourceApk was generated from local resources, that will be the direct dependencies and
-   * the rest will be transitive.
+   * <p>If the ResourceApk was generated from local resources, that will be the direct dependencies
+   * and the rest will be transitive.
    */
   public AndroidResourcesProvider toResourceProvider(Label label, boolean isResourcesOnly) {
     if (primaryResource == null) {