| commit | 2ce04660f60e3b699a6fba69ff8ff8290eb709e9 | [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 | f26350414be97c21fb1efd367c44c27d8717ccc9 | |
| parent | 43a52d0aaa60e10d043f205903b8fbb6585a4f93 [diff] | |
| parent | fde4dfd1565e45edaacae755bb17190293ce6991 [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""