| commit | f4c10e8bc26699a7e8efaebfd0d617aca9cb7718 | [log] [tgz] |
|---|---|---|
| author | Varun Anand <vaanand@google.com> | Mon Jun 17 15:56:24 2019 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Jun 17 15:56:24 2019 +0000 |
| tree | edf040a7c7acc2c8e2147070d018c69288584bde | |
| parent | 4e8973e9a881d13246a70631e4f5763f60f37dc3 [diff] | |
| parent | 833603caabb1a850a63a970fc285b4c8ed7401f8 [diff] |
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""