Varun Anand 2ce04660f6 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""

2019-06-17 15:56:24 +00:00

..

java/com/android/server

Merge changes Ieb8645ac,I6466ec14,I87deb82b,I995b108e,Ib6521459

2019-06-17 15:56:24 +00:00

jni

Add support for TAP interfaces in TestNetworkManager.

2019-04-10 13:29:41 +09:00