From 094caa508fa74081d861e9e8f8eb50934811bf65 Mon Sep 17 00:00:00 2001 From: jingwen Date: Mon, 18 Dec 2017 08:24:12 -0800 Subject: Automatic formatting cleanup of Android *.java files. RELNOTES: None. PiperOrigin-RevId: 179425421 --- .../com/google/devtools/build/android/AndroidResourceMerger.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/tools/android/java/com/google/devtools/build/android/AndroidResourceMerger.java') diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceMerger.java b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceMerger.java index 2013617964..1257def88a 100644 --- a/src/tools/android/java/com/google/devtools/build/android/AndroidResourceMerger.java +++ b/src/tools/android/java/com/google/devtools/build/android/AndroidResourceMerger.java @@ -204,8 +204,8 @@ public class AndroidResourceMerger { } /** - * Merges all secondary compiled resources with the primary compiled resources, - * given that the primary resources have been separately compiled + * Merges all secondary compiled resources with the primary compiled resources, given that the + * primary resources have been separately compiled */ public static void mergeCompiledData( final SerializedAndroidData primary, @@ -245,5 +245,3 @@ public class AndroidResourceMerger { } } } - - -- cgit v1.2.3