diff options
| author | Paul Duffin <paulduffin@google.com> | 2015-01-19 12:46:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-19 12:46:40 +0000 |
| commit | aab56800fcb95e9b1a2d653588b14158080cc6b4 (patch) | |
| tree | 7365392c3ea77742021cf187acfd465f9bb774ab /guava-gwt/test/com/google/common/collect/testModule.gwt.xml | |
| parent | 6fa98dbaae182b511fbeb331e08f5fb827715ea8 (diff) | |
| parent | 84fb43aa6a1e752487f2624055ff26b1b6b7c043 (diff) | |
| download | android_external_guava-aab56800fcb95e9b1a2d653588b14158080cc6b4.tar.gz android_external_guava-aab56800fcb95e9b1a2d653588b14158080cc6b4.tar.bz2 android_external_guava-aab56800fcb95e9b1a2d653588b14158080cc6b4.zip | |
am 84fb43aa: Merge "Revert "Upgraded Guava to unmodified v14.0.1""
* commit '84fb43aa6a1e752487f2624055ff26b1b6b7c043':
Revert "Upgraded Guava to unmodified v14.0.1"
Diffstat (limited to 'guava-gwt/test/com/google/common/collect/testModule.gwt.xml')
| -rw-r--r-- | guava-gwt/test/com/google/common/collect/testModule.gwt.xml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/guava-gwt/test/com/google/common/collect/testModule.gwt.xml b/guava-gwt/test/com/google/common/collect/testModule.gwt.xml index 72ee8bf..47b2f23 100644 --- a/guava-gwt/test/com/google/common/collect/testModule.gwt.xml +++ b/guava-gwt/test/com/google/common/collect/testModule.gwt.xml @@ -4,10 +4,9 @@ <inherits name="com.google.gwt.junit.JUnit"/> <inherits name="com.google.common.base.Base"/> <inherits name="com.google.common.collect.Collect"/> - <inherits name="com.google.common.collect.testing.Testing"/> - <inherits name="com.google.common.collect.testing.google.Google"/> <inherits name="com.google.common.testing.Testing"/> <inherits name="org.junit.contrib.truth.Truth"/> + <inherits name="com.google.common.annotations.Annotations"/> <entry-point class="com.google.common.collect.TestModuleEntryPoint"/> <source path=""/> |