tree f10f29548c37b764583610254ad06c477549bedf
parent 388ae1444f4d4229fdb95e05512a178caac61bb2
parent 045f47bc313fc5f97add215081de2d0d3572b789
author Aaron Huang <huangaaron@google.com> 1633335670 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633335670 +0000

Merge "Enable/disable FrameworksNetTests" am: d1ed1cb8b7 am: 045f47bc31

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1843117

Change-Id: Id1819e5f4af41d325c1269dedb21347693314841