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/MergeConflict.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/MergeConflict.java')
| -rw-r--r-- | src/tools/android/java/com/google/devtools/build/android/MergeConflict.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/MergeConflict.java b/src/tools/android/java/com/google/devtools/build/android/MergeConflict.java index 958c1e8456..5a98086bbb 100644 --- a/src/tools/android/java/com/google/devtools/build/android/MergeConflict.java +++ b/src/tools/android/java/com/google/devtools/build/android/MergeConflict.java @@ -24,11 +24,12 @@ import java.util.Objects; /** * Represents a conflict of two DataResources or DataAssets. * - * For resources, the dataKey is the FullyQualifiedName; Assets use the RelativeAssetPath. + * <p>For resources, the dataKey is the FullyQualifiedName; Assets use the RelativeAssetPath. */ @Immutable public class MergeConflict { - private static final String CONFLICT_MESSAGE = "\n\u001B[31mCONFLICT:\u001B[0m" + private static final String CONFLICT_MESSAGE = + "\n\u001B[31mCONFLICT:\u001B[0m" + " %s is provided with ambiguous priority from:\n\t%s\n\t%s"; private final DataKey dataKey; |