1 files changed, 12 insertions, 0 deletions
diff --git a/android/guava/src/com/google/common/collect/EmptyImmutableListMultimap.java b/android/guava/src/com/google/common/collect/EmptyImmutableListMultimap.java
index 10d030fbd..8a6030182 100644
--- a/android/guava/src/com/google/common/collect/EmptyImmutableListMultimap.java
+++ b/android/guava/src/com/google/common/collect/EmptyImmutableListMultimap.java
@@ -17,6 +17,7 @@
 package com.google.common.collect;
 
 import com.google.common.annotations.GwtCompatible;
+import java.util.Collection;
 
 /**
  * Implementation of {@link ImmutableListMultimap} with no entries.
@@ -32,6 +33,17 @@ class EmptyImmutableListMultimap extends ImmutableListMultimap<Object, Object> {
     super(ImmutableMap.<Object, ImmutableList<Object>>of(), 0);
   }
 
+  /*
+   * TODO(b/242884182): Figure out why this helps produce the same class file when we compile most
+   * of common.collect a second time with the results of the first compilation on the classpath. Or
+   * just back this out once we stop doing that (which we'll do after our internal GWT setup
+   * changes).
+   */
+  @Override
+  public ImmutableMap<Object, Collection<Object>> asMap() {
+    return super.asMap();
+  }
+
   private Object readResolve() {
     return INSTANCE; // preserve singleton property
   }