diff options
| author | Varun Anand <vaanand@google.com> | 2019-06-12 01:05:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-06-12 01:05:01 +0000 |
| commit | 8af90ce15b314cc88c0a4c3a4c04338f215570af (patch) | |
| tree | 767e7707af6e385597903c406123689c18db9c13 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3f2aa4190dbe2e4779110e47e47df90e4e4992cb (diff) | |
| parent | d8220c20507f0c346f517d715c7b9826b04d64e2 (diff) | |
Merge changes from topic "vpn_data_accnt_revert"
* changes:
Revert "Take all VPN underlying networks into account when migrating traffic for"
Revert "NetworkStatsService: Fix getDetailedUidStats to take VPNs into account."
Revert "Addressing comments for http://ag/7700679."
Revert "Add one more test for VPN usage stats."
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions