aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2024-05-07 23:26:47 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2024-05-07 23:26:47 +0000
commitc2bdad3f5876e4b1cd6f309abc417707955aeaf5 (patch)
treeaea3bdc0219699e9a437fc0f0d5df38eb5e9753f
parent89220e9a430c04670075884a7d50f7e6e4544cad (diff)
parentfde698b5c98bc1fe7593527bf864f6e3b63e1e56 (diff)
downloadguava-sdk-release.tar.gz
Merge "Snap for 11812660 from 814caca4fb8994a0857dfe7559f58d29eabc6951 to sdk-release" into sdk-releasesdk-release
-rw-r--r--android/guava-tests/test/com/google/common/base/AndroidIncompatible.java4
-rw-r--r--guava-tests/test/com/google/common/base/AndroidIncompatible.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/android/guava-tests/test/com/google/common/base/AndroidIncompatible.java b/android/guava-tests/test/com/google/common/base/AndroidIncompatible.java
index 9ed987a26..0be1c11ae 100644
--- a/android/guava-tests/test/com/google/common/base/AndroidIncompatible.java
+++ b/android/guava-tests/test/com/google/common/base/AndroidIncompatible.java
@@ -32,8 +32,8 @@ import java.lang.annotation.Target;
* Google-internal Android suite generators. Note that those generators also suppress any test
* annotated with LargeTest.
*
- * <p>Why use a custom annotation instead of {@code android.test.suitebuilder.annotation.Suppress}?
- * I'm not completely sure that this is the right choice, but it has various advantages:
+ * <p>Why use a custom annotation instead of {@code androidx.test.filters.Suppress}? I'm not
+ * completely sure that this is the right choice, but it has various advantages:
*
* <ul>
* <li>An annotation named just "Suppress" might someday be treated by a non-Android tool as a
diff --git a/guava-tests/test/com/google/common/base/AndroidIncompatible.java b/guava-tests/test/com/google/common/base/AndroidIncompatible.java
index 9ed987a26..0be1c11ae 100644
--- a/guava-tests/test/com/google/common/base/AndroidIncompatible.java
+++ b/guava-tests/test/com/google/common/base/AndroidIncompatible.java
@@ -32,8 +32,8 @@ import java.lang.annotation.Target;
* Google-internal Android suite generators. Note that those generators also suppress any test
* annotated with LargeTest.
*
- * <p>Why use a custom annotation instead of {@code android.test.suitebuilder.annotation.Suppress}?
- * I'm not completely sure that this is the right choice, but it has various advantages:
+ * <p>Why use a custom annotation instead of {@code androidx.test.filters.Suppress}? I'm not
+ * completely sure that this is the right choice, but it has various advantages:
*
* <ul>
* <li>An annotation named just "Suppress" might someday be treated by a non-Android tool as a