unknown commit of 5: Fixing the merge warning messages in transitive library overwrites.

Record the sources are overwritten during merging.

--
MOS_MIGRATED_REVID=140654137

1 files changed, 7 insertions, 3 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/xml/Namespaces.java b/src/tools/android/java/com/google/devtools/build/android/xml/Namespaces.java
index cbaabea740..27947d6e01 100644
--- a/src/tools/android/java/com/google/devtools/build/android/xml/Namespaces.java
+++ b/src/tools/android/java/com/google/devtools/build/android/xml/Namespaces.java
@@ -13,6 +13,7 @@
 // limitations under the License.
 package com.google.devtools.build.android.xml;
 
+import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableMap;
 import com.google.devtools.build.android.DataResourceXml;
 import com.google.devtools.build.android.XmlResourceValue;
@@ -43,9 +44,7 @@ public class Namespaces implements Iterable<Entry<String, String>> {
   private static final Namespaces EMPTY_INSTANCE =
       new Namespaces(ImmutableMap.<String, String>of());
 
-  /**
-   * Collects prefix and uri pairs from elements.
-   */
+  /** Collects prefix and uri pairs from elements. */
   public static class Collector {
     private Map<String, String> prefixToUri = new HashMap<>();
 
@@ -149,6 +148,11 @@ public class Namespaces implements Iterable<Entry<String, String>> {
   }
 
   @Override
+  public String toString() {
+    return MoreObjects.toStringHelper(getClass()).add("prefixToUri", prefixToUri).toString();
+  }
+
+  @Override
   public boolean equals(Object obj) {
     if (obj instanceof Namespaces) {
       Namespaces other = (Namespaces) obj;