tree 31df512d0adc6b1263f4c2f0a3c34dee165c744a
parent 1592dc049a02c3a37b3310760a1fb72b8b84c1d9
parent 08ea96702d4c78c5fe6dd83dfca52511f3cea704
author Mark Chien <markchien@google.com> 1643084607 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1643084607 +0000

Merge "Replace INetd#trafficSwapActiveStatsMap with ConnectivityManager API" am: 121c4fc872 am: b78a7dba1c am: 08ea96702d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1948924

Change-Id: Ie52faaff3b8b63ef6f9938a0022a4ecbdca69a2f