commit 0839ba9a609002a4b29290a55caa125e363e629e
author Ian Rogers <irogers@google.com> Tue May 03 17:01:49 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 03 17:01:49 2016 +0000
tree 2e612aebf4f1e17eed3fe50eacec79934cc62dae
parent e325e531e2540c5b35bac38c23e38e327f9926c0
parent 859d9ed5b3fc1b26c2b79bf7b3a956d7d492971b

Merge "Backport: Work around a type inference change in javac" am: a728081e33
am: 859d9ed5b3

* commit '859d9ed5b3fc1b26c2b79bf7b3a956d7d492971b':
  Backport: Work around a type inference change in javac

Change-Id: I20dc71c79ac17115f1993d1c6c22fdab7fb92a07

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

diff --git a/guava/src/com/google/common/collect/Collections2.java b/guava/src/com/google/common/collect/Collections2.java
index a0c46b1..9ce5249 100644
--- a/guava/src/com/google/common/collect/Collections2.java
+++ b/guava/src/com/google/common/collect/Collections2.java
@@ -198,12 +198,12 @@
 
     @Override
     public boolean removeAll(final Collection<?> collection) {
-      return Iterables.removeIf(unfiltered, and(predicate, in(collection)));
+      return Iterables.removeIf(unfiltered, and(predicate, Predicates.<Object>in(collection)));
     }
 
     @Override
     public boolean retainAll(final Collection<?> collection) {
-      return Iterables.removeIf(unfiltered, and(predicate, not(in(collection))));
+      return Iterables.removeIf(unfiltered, and(predicate, not(Predicates.<Object>in(collection))));
     }
 
     @Override