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/AndroidDataMerger.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/AndroidDataMerger.java')
| -rw-r--r-- | src/tools/android/java/com/google/devtools/build/android/AndroidDataMerger.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/AndroidDataMerger.java b/src/tools/android/java/com/google/devtools/build/android/AndroidDataMerger.java index 16b43b848e..2a8c298335 100644 --- a/src/tools/android/java/com/google/devtools/build/android/AndroidDataMerger.java +++ b/src/tools/android/java/com/google/devtools/build/android/AndroidDataMerger.java @@ -232,8 +232,7 @@ class AndroidDataMerger { * the ultimate source of truth, provided it doesn't conflict with itself. * @return An UnwrittenMergedAndroidData, containing DataResource objects that can be written to * disk for aapt processing or serialized for future merge passes. - * @throws MergingException if there are issues with parsing resources from - * primaryData. + * @throws MergingException if there are issues with parsing resources from primaryData. * @throws MergeConflictException if there are merge conflicts */ UnwrittenMergedAndroidData merge( |