| commit | 3547965d2a4712ef3fdd8f90e90aad77e46240b6 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Mon Jun 24 03:37:23 2019 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Jun 24 03:37:23 2019 +0000 |
| tree | 50f795e16423bf3e46cc4c096c1f666f66113455 | |
| parent | e660a0a7e26e5e347755662d2b69170966bfad0c [diff] | |
| parent | 1082dddfd3aaa053475befcd5875e32d3d6b6572 [diff] |
Merge changes If7d41052,I66f263d7,Id45ae956,Iba752fed,I575a7e4f, ... into qt-r1-dev * changes: Inline readNetworkStatsDetailInternal, make mUseBpfStats final 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""