tree b9c05b24e330f88a9fd49489368b2cc4db565c20
parent 52cf873cab284457532d429eab8abf0d8a7663a8
parent 21f0d58294154d21cd6e8710bc66981435a1a84b
author Mark Chien <markchien@google.com> 1642139847 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1642139847 +0000

Merge "Add swapActiveStatsMap API for NetworkStatsFactory" am: 21f0d58294

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

Change-Id: I926f9d5ad5f43be2c93e35bb50a9d7906cc7dd57