commit 3684713b8a0464580b2008ea432c1703a730e529
author Baligh Uddin <baligh@google.com> Sun May 23 16:38:40 2021 +0000
committer Remi NGUYEN VAN <reminv@google.com> Mon May 24 05:45:18 2021 +0000
tree a1323a1e782c446b0c5e788c3fddd4d678fbf05e
parent 14e14a36ea05f7a7591883df4d5e324cc50a9a4e
parent 3dcbcae8393a6464d7729789c09c6aa71610a0fd

Merge history of packages/Connectivity

Modified License Import for:
- Tethering/common/TetheringLib/Android.bp
- framework/Android.bp
- service/Android.bp
- tests/common/Android.bp
- tests/deflake/Android.bp
- tests/integration/Android.bp
- tests/smoketest/Android.bp
- tests/unit/Android.bp
- tests/unit/jni/Android.bp

BUG: 186628461
TEST: TH
Merged-In: I7b5fd61cd551c7010f5b8ceabbfdd04f30f648dd
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Change-Id: Ia2185820f485e8ad2d3626a96eab7f5a874736cf

TEST_MAPPING

diff --git a/TEST_MAPPING b/TEST_MAPPING
index 9a455ba..7c638a2 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -43,5 +43,22 @@
     {
       "path": "packages/modules/NetworkStack"
     }
+  ],
+  "imports": [
+    {
+      "path": "frameworks/base/core/java/android/net"
+    },
+    {
+      "path": "packages/modules/NetworkStack"
+    },
+    {
+      "path": "packages/modules/CaptivePortalLogin"
+    },
+    {
+      "path": "packages/modules/Connectivity"
+    },
+    {
+      "path": "packages/modules/Connectivity/Tethering"
+    }
   ]
 }