From e52f56c6f47182ef195f6a71345c8edf115b9f71 Mon Sep 17 00:00:00 2001
From: Simran Basi <sbasi@google.com>
Date: Wed, 30 Jan 2019 16:38:27 -0800
Subject: TEST_MAPPING: Remove CtsActivityManagerDeviceSdk25TestCases

Test module is too flaky, removing for now.

Bug:123658982
Test: None
Change-Id: If6dc8157acc402b0c1d5fc80f1eb36f584998508
---
 .../core/java/com/android/server/am/TEST_MAPPING   | 25 ----------------------
 1 file changed, 25 deletions(-)

diff --git a/services/core/java/com/android/server/am/TEST_MAPPING b/services/core/java/com/android/server/am/TEST_MAPPING
index c84b5c74c1e7..117174a6465e 100644
--- a/services/core/java/com/android/server/am/TEST_MAPPING
+++ b/services/core/java/com/android/server/am/TEST_MAPPING
@@ -1,16 +1,5 @@
 {
   "presubmit": [
-    {
-      "name": "CtsActivityManagerDeviceSdk25TestCases",
-      "options": [
-        {
-          "include-annotation": "android.platform.test.annotations.Presubmit"
-        },
-        {
-          "exclude-annotation": "androidx.test.filters.FlakyTest"
-        }
-      ]
-    },
     {
       "name": "CtsAppTestCases",
       "options": [
@@ -38,20 +27,6 @@
           "exclude-annotation": "androidx.test.filters.FlakyTest"
         }
       ]
-    },
-    {
-      "name": "WmTests",
-      "options": [
-        {
-          "include-filter": "com.android.server.am."
-        },
-        {
-          "include-annotation": "android.platform.test.annotations.Presubmit"
-        },
-        {
-          "exclude-annotation": "androidx.test.filters.FlakyTest"
-        }
-      ]
     }
   ],
   "postsubmit": [
-- 
cgit v1.2.3-59-g8ed1b