diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2019-06-24 03:37:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-06-24 03:37:23 +0000 |
| commit | f80234a9b00d00ccf8d0c734f3f81e351d7fd507 (patch) | |
| tree | 901bc670948cc59f6714c90898625ebab355edd2 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | df1e8c9cf3f1ce19203f431346b20bced88e36b0 (diff) | |
| parent | 51a770bfc7d26f359a147efa235c2b7e110b0b9a (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""
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions