diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2018-01-23 15:22:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-01-23 15:22:18 +0000 |
| commit | df984fae2656104d84fec8fa876f2236d290da39 (patch) | |
| tree | 196e5130866bccbebf1131ccd6b7fbafca6dec15 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | bf996dd479d933b1e6be8fae50d1517229047674 (diff) | |
| parent | d15c937f972b08e62516f361cf6bbe95b64132ce (diff) | |
Merge changes from topic "multipath-datausage-backport"
* changes:
Support passing a template to NetworkStatsManager queries.
Add metered, roaming, and defaultNetwork info to NetworkTemplate.
Unbreak frameworks-net tests broken by missing libutilscallstack.
Disable IpConnectivityMetricsTest.
Add the defaultNetwork element to the netstats.proto.
Add getDefaultNetwork to the NetworkStats public API.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions