commit 38b83f055850b1eafaf2286f8a462ca3bae328f1
author Dan Shi <dshi@google.com> Sat Oct 05 18:57:34 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Oct 05 18:57:34 2019 +0000
tree 67920a6abeea674449f23b03fc5a3974c9c5e746
parent fe6978a73ff83332e720f128d4afa7586f43cc0a
parent 78fdd5605f1ba95a1706fe3e1770a55fc7ec7b4e

Merge "Sync TEST_MAPPING file from master branch"

services/devicepolicy/TEST_MAPPING

diff --git a/services/devicepolicy/TEST_MAPPING b/services/devicepolicy/TEST_MAPPING
index ab85a68..a5ee3e2 100644
--- a/services/devicepolicy/TEST_MAPPING
+++ b/services/devicepolicy/TEST_MAPPING
@@ -1,4 +1,17 @@
 {
+  "presubmit": [
+    {
+      "name": "CtsDevicePolicyManagerTestCases",
+      "options": [
+        {
+          "exclude-annotation": "android.platform.test.annotations.FlakyTest"
+        },
+        {
+          "exclude-annotation": "android.platform.test.annotations.LargeTest"
+        }
+      ]
+    }
+  ],
   "postsubmit": [
     {
       "name": "CtsDevicePolicyManagerTestCases"