Merge Android10 QPR1 into AOSP master

Bug: 145570283 Change-Id: I5d4ce122ba88291691f6a8058b5b0181ad02763c
2019-12-02 21:25:02 -08:00
parent f43b3bb3ee a32ea36c31
commit 061fea79eb
2 changed files with 3 additions and 1 deletions
--- a/tests/cts/net/Android.bp
+++ b/tests/cts/net/Android.bp
@@ -60,6 +60,7 @@ android_test {
        "cts",
        "vts",
        "general-tests",
+        "mts",
    ],

 }
--- a/tests/cts/net/native/dns/Android.bp
+++ b/tests/cts/net/native/dns/Android.bp
@@ -35,5 +35,6 @@ cc_test {
    },
    test_suites: [
        "cts",
+        "mts",
    ],
-}
+}