Renaming nonOverwriting to combining resources.

--
MOS_MIGRATED_REVID=121863653

1 files changed, 5 insertions, 5 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/KeyValueConsumers.java b/src/tools/android/java/com/google/devtools/build/android/KeyValueConsumers.java
index 86789b27b4..63b0a3a036 100644
--- a/src/tools/android/java/com/google/devtools/build/android/KeyValueConsumers.java
+++ b/src/tools/android/java/com/google/devtools/build/android/KeyValueConsumers.java
@@ -23,21 +23,21 @@ import com.google.devtools.build.android.ParsedAndroidData.KeyValueConsumer;
 class KeyValueConsumers {
   static KeyValueConsumers of(
       KeyValueConsumer<DataKey, DataResource> overwritingConsumer,
-      KeyValueConsumer<DataKey, DataResource> nonOverwritingConsumer,
+      KeyValueConsumer<DataKey, DataResource> combiningConsumer,
       KeyValueConsumer<DataKey, DataAsset> assetConsumer) {
-    return new KeyValueConsumers(overwritingConsumer, nonOverwritingConsumer, assetConsumer);
+    return new KeyValueConsumers(overwritingConsumer, combiningConsumer, assetConsumer);
   }
 
   final KeyValueConsumer<DataKey, DataResource> overwritingConsumer;
-  final KeyValueConsumer<DataKey, DataResource> nonOverwritingConsumer;
+  final KeyValueConsumer<DataKey, DataResource> combiningConsumer;
   final KeyValueConsumer<DataKey, DataAsset> assetConsumer;
 
   private KeyValueConsumers(
       KeyValueConsumer<DataKey, DataResource> overwritingConsumer,
-      KeyValueConsumer<DataKey, DataResource> nonOverwritingConsumer,
+      KeyValueConsumer<DataKey, DataResource> combiningConsumer,
       KeyValueConsumer<DataKey, DataAsset> assetConsumer) {
     this.overwritingConsumer = overwritingConsumer;
-    this.nonOverwritingConsumer = nonOverwritingConsumer;
+    this.combiningConsumer = combiningConsumer;
     this.assetConsumer = assetConsumer;
   }
 }