Merge "Put @LockSettingsTest back into blocking presubmit."

2020-05-21 11:58:22 +00:00
parent 235e96ac4f 9bec4c449b
commit 7ea81c1675
2 changed files with 2 additions and 2 deletions
--- a/cmds/locksettings/TEST_MAPPING
+++ b/cmds/locksettings/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-    "presubmit-devicepolicy": [
+    "presubmit": [
        {
            "name": "CtsDevicePolicyManagerTestCases",
            "options": [
--- a/services/core/java/com/android/server/locksettings/TEST_MAPPING
+++ b/services/core/java/com/android/server/locksettings/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-    "presubmit-devicepolicy": [
+    "presubmit": [
        {
            "name": "CtsDevicePolicyManagerTestCases",
            "options": [