| commit | 636e28a15599973e787a51864bec7808ab6a7b9e | [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 | 94103bdf0450393829c9500dd6ed3b248c9db18a [diff] | |
| parent | 1f282ae3a4898ffcb41f8b7b2a74401b515c59ca [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""