tree 556d3f27417da650f263caf47b553795b4c2e1f8
parent d89365b3e3c8e53bb99c73374116fdff3e2e782c
parent a0f346958f0f87a1d72efbe39fab7f611ee4447f
author Patrick Rohr <prohr@google.com> 1645045359 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1645045359 +0000

Merge "Fix NetworkStatsServiceTest after adding deleteKernelTagData" am: 3226bfb631 am: a0f346958f

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1968682

Change-Id: I865ceade7e2c45b3a4e436b52b9dd220a878116b