commit 78fdd5605f1ba95a1706fe3e1770a55fc7ec7b4e
author Dan Shi <dshi@google.com> Fri Oct 04 22:43:37 2019 -0700
committer Dan Shi <dshi@google.com> Fri Oct 04 22:43:37 2019 -0700
tree bf91278c28d38dcf0df398dab09c9dc80710d6ea
parent 7dbc7ed54319d6b2114f9e1bb79aeac92eb9ece3

Sync TEST_MAPPING file from master branch

Bug: 141061952
Test: none
Change-Id: I5ed8cb0d499a75562f8db32989eed32a8a877ae7

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"