diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-05-28 13:16:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-05-28 13:16:54 +0000 |
| commit | c119ee1ed2c70727b786bdbbfaec0776b45cb4a0 (patch) | |
| tree | 1714d65a897a2aa3a2918892fbbe3c9153bf4832 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | bad91c0ea4068e551ff307429a55eebc68c0507d (diff) | |
| parent | b2603a31939f737723bdf93fd4c3bb4df65d5a69 (diff) | |
Merge changes I289d935f,I0121a4ac,Ie73ba058,I4393afcb,Ifebd946e, ... into rvc-dev
* changes:
NetworkStats: apply464xlatAdjustments - don't remove CLAT_UID
NetworkStats: apply464xlatAdjustments - remove useBpfStats parameter.
fix com.android.server.net.NetworkStatsFactoryTest#testDoubleClatAccounting100MBDownload
fix com.android.server.net.NetworkStatsFactoryTest#testDoubleClatAccounting
fix com.android.server.net.NetworkStatsFactoryTest#testDoubleClatAccountingSimple
fix android.net.NetworkStatsTest#testApply464xlatAdjustments
NetworkStats - no need for xt_qtaguid clat bw fixups
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions