Renaming nonOverwriting to combining resources.

--
MOS_MIGRATED_REVID=121863653

1 files changed, 2 insertions, 2 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/XmlResourceValues.java b/src/tools/android/java/com/google/devtools/build/android/XmlResourceValues.java
index 978a4d0a69..3a0eefc3c9 100644
--- a/src/tools/android/java/com/google/devtools/build/android/XmlResourceValues.java
+++ b/src/tools/android/java/com/google/devtools/build/android/XmlResourceValues.java
@@ -111,7 +111,7 @@ public class XmlResourceValues {
       FullyQualifiedName.Factory fqnFactory,
       Path path,
       KeyValueConsumer<DataKey, DataResource> overwritingConsumer,
-      KeyValueConsumer<DataKey, DataResource> nonOverwritingConsumer,
+      KeyValueConsumer<DataKey, DataResource> combiningConsumer,
       XMLEventReader eventReader,
       StartElement start)
       throws XMLStreamException {
@@ -134,7 +134,7 @@ public class XmlResourceValues {
         }
       }
     }
-    nonOverwritingConsumer.consume(
+    combiningConsumer.consume(
         fqnFactory.create(ResourceType.STYLEABLE, getElementName(start)),
         DataResourceXml.of(path, StyleableXmlResourceValue.of(members)));
   }