tree 86860039cf1b8a24724991f4455ea6ca65f123a8
parent f376b27a5c7226662fc6902bf4d51b81beea372a
parent ddf729bb8dee90882ace7d3780a71ed8872fb0e8
author Lorenzo Colitti <lorenzo@google.com> 1516720938 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1516720938 +0000

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.