Skip to content
Commit f80ebafa authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-2e62287de9d64a8d9d3aba7f81c8e5cf"

* changes:
  Merge changes from topic "multipath-datausage-backport" am: df984fae am: c46c21c7 am: ce9b0098  -s ours
  Add metered, roaming, and defaultNetwork info to NetworkTemplate. am: 0f9bce68 am: e383807d am: f5c668bf  -s ours
  Unbreak frameworks-net tests broken by missing libutilscallstack. am: f7fab104 am: df4aba36 am: 333eb0ee  -s ours
  Disable IpConnectivityMetricsTest. am: b7a479c2 am: afb4ba1c am: 2d1c6405  -s ours
  Add the defaultNetwork element to the netstats.proto. am: 9781f785 am: adcb9447 am: 5d501497  -s ours
  Add getDefaultNetwork to the NetworkStats public API. am: d5876bc4 am: 66eab17a am: 424fbdbd  -s ours
parents 04c47f21 35396c52
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment