commit 27b6918c71f66828718f38b78fe85b6e62d6b24c
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jan 11 00:16:24 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 11 00:16:24 2019 +0000
tree 8de99a400014bf801b9409ad1a929a6272162579
parent 959468ca6ee0d1ffa8419c866cfe5f6b0ec0ccd0
parent 72cb7277f03c65d8bd281cb90398c6abbcb4aede

Merge "Migrate frameworks/base/services/core/java/com/android/server/policy  to androidx.test"

services/core/java/com/android/server/policy/TEST_MAPPING

diff --git a/services/core/java/com/android/server/policy/TEST_MAPPING b/services/core/java/com/android/server/policy/TEST_MAPPING
index e212b04..437ef73 100644
--- a/services/core/java/com/android/server/policy/TEST_MAPPING
+++ b/services/core/java/com/android/server/policy/TEST_MAPPING
@@ -10,7 +10,7 @@
           "include-annotation": "android.platform.test.annotations.Presubmit"
         },
         {
-          "exclude-annotation": "android.support.test.filters.FlakyTest"
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
         }
       ]
     },