diff options
| author | Ian Rogers <irogers@google.com> | 2016-05-03 16:59:11 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-03 16:59:11 +0000 |
| commit | 859d9ed5b3fc1b26c2b79bf7b3a956d7d492971b (patch) | |
| tree | 08f5e41a91ebcae942ee73b000aa99ec314903e7 | |
| parent | 2dc668f6c00d741cfc4b3778eca6953d87fe43ff (diff) | |
| parent | a728081e33734f0f1b1260a98d6e6292dfcbd66c (diff) | |
| download | guava-859d9ed5b3fc1b26c2b79bf7b3a956d7d492971b.tar.gz | |
Merge "Backport: Work around a type inference change in javac"
am: a728081e33
* commit 'a728081e33734f0f1b1260a98d6e6292dfcbd66c':
Backport: Work around a type inference change in javac
Change-Id: I2aaff9e7d36f9f3c045815738489ae12239cde8a
| -rw-r--r-- | guava/src/com/google/common/collect/Collections2.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/guava/src/com/google/common/collect/Collections2.java b/guava/src/com/google/common/collect/Collections2.java index a0c46b17e..9ce52497b 100644 --- a/guava/src/com/google/common/collect/Collections2.java +++ b/guava/src/com/google/common/collect/Collections2.java @@ -198,12 +198,12 @@ public final class Collections2 { @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 |