Christopher Lane 4425300440 resolved conflicts for merge of 381ac080 to master am: 70cafe1b52 ...

Original change: undetermined

Change-Id: If8f1d6522e00c087356a5ad6ea8a4b494ade54bd

2021-05-31 07:14:51 +00:00

..

common

Merge history of packages/Connectivity

2021-05-24 04:40:14 +00:00

CoreTests/android/core

Add support for custom TXT records in NSD

2014-04-14 14:10:36 -07:00

cts

Merge "Test tethered callback with TetheringInterface" into sc-dev

2021-05-21 16:04:47 +00:00

deflake

Merge history of packages/Connectivity

2021-05-24 04:40:14 +00:00

integration

Merge history of packages/Connectivity

2021-05-24 04:40:14 +00:00

smoketest

Merge history of packages/Connectivity

2021-05-24 04:40:14 +00:00

unit

Update allowed on restricted networks getter/setter

2021-05-26 16:16:57 +08:00

OWNERS

Move net unit tests to packages/Connectivity

2021-05-13 08:30:33 +00:00

TEST_MAPPING

Move net unit tests to packages/Connectivity

2021-05-13 08:30:33 +00:00