diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2018-01-23 20:22:10 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-01-23 20:22:10 +0000 |
| commit | f80ebafa34b3531f73b8d42942f625e334433a6d (patch) | |
| tree | 5dd3deebd17c4b0fdce718b239640622dfade8e5 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 04c47f217848ba92ba4efc9d314d8cf234ec1153 (diff) | |
| parent | 35396c529a20f3aee10d1d6f409b8beb9b1ec022 (diff) | |
Merge changes from topic "am-2e62287de9d64a8d9d3aba7f81c8e5cf"
* changes:
Merge changes from topic "multipath-datausage-backport" am: df984fae26 am: c46c21c702 am: ce9b009827 -s ours
Add metered, roaming, and defaultNetwork info to NetworkTemplate. am: 0f9bce6883 am: e383807d7f am: f5c668bf38 -s ours
Unbreak frameworks-net tests broken by missing libutilscallstack. am: f7fab104f9 am: df4aba36b4 am: 333eb0ee46 -s ours
Disable IpConnectivityMetricsTest. am: b7a479c293 am: afb4ba1c35 am: 2d1c6405d6 -s ours
Add the defaultNetwork element to the netstats.proto. am: 9781f785bc am: adcb94472a am: 5d50149710 -s ours
Add getDefaultNetwork to the NetworkStats public API. am: d5876bc438 am: 66eab17abc am: 424fbdbd1e -s ours
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions