tree 5d77bcbf92910dd22523c9260f50090042d9d157
parent d1ed21007a263682002592940c6b666095b65d6a
parent 1faca14f77f4662180f42dfa7ec6072521902768
author Aaron Huang <huangaaron@google.com> 1637561017 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1637561017 +0000

Merge "Use real ProxyTracker in ConnectivityServiceTest" am: c7037475fa am: 4fc403c3b0 am: 1faca14f77

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

Change-Id: I2f4a689aae9dafbad0bb5e3cd74f43a5c72fd898