tree 0f4abca25bee7768b7f9e85b588bb3c6feb1afa0
parent 26fdabb9a08c01b5fb55062d299dfea1e6eb1083
parent 1419b0b20e4b079bfa66662d042b4dc35fb22d78
author Varun Anand <vaanand@google.com> 1559147654 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1559147654 +0000

Merge changes from topic "vpn_data_accounting" into qt-dev

* changes:
  Add one more test for VPN usage stats.
  Addressing comments for http://ag/7700679.
  NetworkStatsService: Fix getDetailedUidStats to take VPNs into account.
  Take all VPN underlying networks into account when migrating traffic for VPN uid.