diff options
| author | 2019-01-09 09:02:22 +0000 | |
|---|---|---|
| committer | 2019-01-09 09:02:22 +0000 | |
| commit | bf1f04a79a7ab21d613a6febace323957f26106f (patch) | |
| tree | 1e6de90222a5ab0a46e8c669345c53dbf2c36b27 | |
| parent | 4505ce946d6dedd5b3743dc8d327bf48bc21d385 (diff) | |
| parent | 561267566eb13bcbd9478292d32b25761b8aa9a1 (diff) | |
Merge "Migrate frameworks/base/services/core/java/com/android/server/am to androidx.test"
| -rw-r--r-- | services/core/java/com/android/server/am/TEST_MAPPING | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/am/TEST_MAPPING b/services/core/java/com/android/server/am/TEST_MAPPING index 48b414581d45..c84b5c74c1e7 100644 --- a/services/core/java/com/android/server/am/TEST_MAPPING +++ b/services/core/java/com/android/server/am/TEST_MAPPING @@ -7,7 +7,7 @@ "include-annotation": "android.platform.test.annotations.Presubmit" }, { - "exclude-annotation": "android.support.test.filters.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" } ] }, @@ -21,7 +21,7 @@ "include-annotation": "android.platform.test.annotations.Presubmit" }, { - "exclude-annotation": "android.support.test.filters.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" } ] }, |