diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-05-28 10:34:01 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-05-28 10:34:01 +0000 |
commit | 7ed442881ccbe92824a752d1d8e7e553b5b64e79 (patch) | |
tree | df2fbd9ee9989bb7f63352fe32db5b1297f26e72 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | e2730424042588976edddf6f4666983b47ce6bdd (diff) | |
parent | 8de903184a4f0312a744012e4059e51c79a67a46 (diff) |
Merge changes I289d935f,I0121a4ac
* changes:
NetworkStats: apply464xlatAdjustments - don't remove CLAT_UID
NetworkStats: apply464xlatAdjustments - remove useBpfStats parameter.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions