tree 3e8331fba2ae2b19f00a4b82c52964af4d00d620
parent fec250f5259ffe6ba5bf7afb7ad0aad5d573243f
parent f3cf7c00a6831e1c5248a62c14bbce2e5e80fb2e
author Mark Chien <markchien@google.com> 1643082496 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1643082496 +0000

Merge "Replace INetd#trafficSwapActiveStatsMap with ConnectivityManager API" am: f3cf7c00a6

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

Change-Id: Ife48b26f966b78d9a9016332bb968c3c863b8425