Skip to content
Commit f4c10e8b authored by Varun Anand's avatar Varun Anand Committed by Gerrit Code Review
Browse files

Merge changes Ieb8645ac,I6466ec14,I87deb82b,I995b108e,Ib6521459 

* changes:
  Remove VPN info arrays from NetworkStats(Observer|Recorder)
  NetworkStatsFactory: Take VPNs into account for network/battery stats
  Remove duplicate line in clat_simple test file
  Remove unused lastStats parameter
  Revert "Revert "Take all VPN underlying networks into account when migrating traffic for""
parents 4e8973e9 833603ca
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment