tree 196e5130866bccbebf1131ccd6b7fbafca6dec15
parent bf996dd479d933b1e6be8fae50d1517229047674
parent d15c937f972b08e62516f361cf6bbe95b64132ce
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.