aboutsummaryrefslogtreecommitdiffstats
path: root/guava-testlib/src/com/google/common/collect/testing/features/ConflictingRequirementsException.java
Commit message (Collapse)AuthorAgeFilesLines
* Upgraded Guava to unmodified jdk5-backport-v17.0-compatibilityPaul Duffin2015-02-121-2/+0
| | | | | | | | | | | | This simply copies the Guava source for jdk5-backport-v17.0-compatibility straight from the github repository into this one. See https://github.com/google/guava.git Additional commits will be made which will allow this to compile on Android. Change-Id: I07db3bd92bb7370cad9d9b9c9cc4d67733b079b6
* Upgraded Guava to unmodified jdk-backport-v14.0.1-postPaul Duffin2015-01-221-0/+3
| | | | | | | | | | | | This simply copies the Guava source for jdk5-backport-v14.0.1 straight from the code.google.com repository into this one. See https://code.google.com/p/guava-libraries.jdk5backport/ Additional commits will be made which will allow this to compile on Android. Change-Id: I4f02d6182d25e4e636ac64d48647a395a9874296
* Revert "Upgraded Guava to unmodified v14.0.1"Paul Duffin2015-01-191-3/+0
| | | | | | This reverts commit 3c77433663281544363151bf284b0240dfd22a42. Change-Id: I25630eb4eef9a993c94f273796d3d9f04811e74d
* Upgraded Guava to unmodified v14.0.1Paul Duffin2015-01-081-0/+3
| | | | | | | | This simply copies the Guava source for v14.0.1 straight from its github repository into this one. Additional commits will be made which will allow this to compile on Android. Change-Id: If0a8231e1d9530b7bdd94474403f7055e013979f
* Upgrade guava to v11.0.2Bjorn Bringert2012-05-081-0/+53
Bug: 6457759 Change-Id: Ie9aa2faaf572f1be8e203a447f357510136ae6b9
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 19:05:22 +0000