Continuing preparing to make immutable-collection Collector APIs available in guava-android (but don't do so yet).

This CL is further progress toward #6567

RELNOTES=n/a
PiperOrigin-RevId: 579462040

Author: cpovirk

android/guava/src/com/google/common/collect/ImmutableMultiset.java

@@ -56,6 +56,7 @@
 @ElementTypesAreNonnullByDefault
 public abstract class ImmutableMultiset<E> extends ImmutableMultisetGwtSerializationDependencies<E>
     implements Multiset<E> {
+
   /**
    * Returns the empty immutable multiset.
    *
@@ -636,4 +637,6 @@ public ImmutableMultiset<E> build() {
       return new RegularImmutableMultiset<E>(contents);
     }
   }
+
+  private static final long serialVersionUID = 0xdecaf;
 }

android/guava/src/com/google/common/collect/ImmutableSortedMultiset.java

@@ -683,9 +683,9 @@ private void readObject(ObjectInputStream stream) throws InvalidObjectException
   }
 
   /**
-   * Not supported. Use {@link ImmutableSortedMultiset#naturalOrder}, which offers better
-   * type-safety, instead. This method exists only to hide {@link ImmutableMultiset#builder} from
-   * consumers of {@code ImmutableSortedMultiset}.
+   * Not supported. Use {@link #naturalOrder}, which offers better type-safety, instead. This method
+   * exists only to hide {@link ImmutableMultiset#builder} from consumers of {@code
+   * ImmutableSortedMultiset}.
    *
    * @throws UnsupportedOperationException always
    * @deprecated Use {@link ImmutableSortedMultiset#naturalOrder}, which offers better type-safety.
@@ -804,4 +804,6 @@ public static <E> ImmutableSortedMultiset<E> of(
   public static <Z> ImmutableSortedMultiset<Z> copyOf(Z[] elements) {
     throw new UnsupportedOperationException();
   }
+
+  private static final long serialVersionUID = 0xdecaf;
 }

android/guava/src/com/google/common/collect/ImmutableSortedSet.java

@@ -62,6 +62,7 @@
 @ElementTypesAreNonnullByDefault
 public abstract class ImmutableSortedSet<E> extends ImmutableSet<E>
     implements NavigableSet<E>, SortedIterable<E> {
+
   static <E> RegularImmutableSortedSet<E> emptySet(Comparator<? super E> comparator) {
     if (Ordering.natural().equals(comparator)) {
       return (RegularImmutableSortedSet<E>) RegularImmutableSortedSet.NATURAL_EMPTY_SET;
@@ -851,9 +852,8 @@ Object writeReplace() {
   }
 
   /**
-   * Not supported. Use {@link ImmutableSortedSet#naturalOrder}, which offers better type-safety,
-   * instead. This method exists only to hide {@link ImmutableSet#builder} from consumers of {@code
-   * ImmutableSortedSet}.
+   * Not supported. Use {@link #naturalOrder}, which offers better type-safety, instead. This method
+   * exists only to hide {@link ImmutableSet#builder} from consumers of {@code ImmutableSortedSet}.
    *
    * @throws UnsupportedOperationException always
    * @deprecated Use {@link ImmutableSortedSet#naturalOrder}, which offers better type-safety.

guava/src/com/google/common/collect/ImmutableMultiset.java

@@ -660,4 +660,6 @@ Object readResolve() {
 
     private static final long serialVersionUID = 0;
   }
+
+  private static final long serialVersionUID = 0xcafebabe;
 }

guava/src/com/google/common/collect/ImmutableSortedMultiset.java

@@ -762,4 +762,6 @@ public static <E> ImmutableSortedMultiset<E> of(
   public static <Z> ImmutableSortedMultiset<Z> copyOf(Z[] elements) {
     throw new UnsupportedOperationException();
   }
+
+  private static final long serialVersionUID = 0xcafebabe;
 }