diff options
| author |  jingwen <jingwen@google.com> | 2017-12-18 08:24:12 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2017-12-18 08:25:32 -0800 |
| commit | 094caa508fa74081d861e9e8f8eb50934811bf65 (patch) | |
| tree | c6911010ba0c7dea50fa13ee718f93719b43eb8a /src/tools/android/java/com/google/devtools/build/android/AndroidResourceMerger.java | |
| parent | 310fe150811c6abe0c52232eb5cb0e4380a6e084 (diff) | |
Automatic formatting cleanup of Android *.java files.
RELNOTES: None.
PiperOrigin-RevId: 179425421
Diffstat (limited to 'src/tools/android/java/com/google/devtools/build/android/AndroidResourceMerger.java')
| -rw-r--r-- | src/tools/android/java/com/google/devtools/build/android/AndroidResourceMerger.java | 6 |
1 files changed, 2 insertions, 4 deletions
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 { } } } - - |