commit a4abf50c684223b81e8fdc1e26af5bd56ae83429
author Paul Duffin <paulduffin@google.com> Fri Feb 24 13:33:00 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Feb 24 13:33:00 2017 +0000
tree c943ef6426c373006eda0dfd137bed3dcb7e7d30
parent 44deb443eba961ee519dbbfacfb919dcee95dda0
parent a5651492460e782407cbbd7beac5f6c0c7915958

Merge changes from topic 'upgrade-hamcrest-to-2.0'
am: a565149246

Change-Id: I07fbfb874b63dda6e1c2ebf19c75cff709059779

src/main/java/org/junit/matchers/JUnitMatchers.java

diff --git a/src/main/java/org/junit/matchers/JUnitMatchers.java b/src/main/java/org/junit/matchers/JUnitMatchers.java
index 13407cc..5bb48d7 100644
--- a/src/main/java/org/junit/matchers/JUnitMatchers.java
+++ b/src/main/java/org/junit/matchers/JUnitMatchers.java
@@ -48,7 +48,7 @@
      */
     @Deprecated
     public static <T> Matcher<Iterable<T>> hasItems(Matcher<? super T>... elementMatchers) {
-        return CoreMatchers.hasItems(elementMatchers);
+        return CoreMatchers.<T>hasItems(elementMatchers);
     }
 
     /**
@@ -57,7 +57,7 @@
      */
     @Deprecated
     public static <T> Matcher<Iterable<T>> everyItem(final Matcher<T> elementMatcher) {
-        return CoreMatchers.everyItem(elementMatcher);
+        return CoreMatchers.everyItem((Matcher) elementMatcher);
     }
 
     /**