tree 1dd3737971785fa4b510366ee225043f4e037b69
parent 346e9c90504af71257ab5d439533e1a713bf87d7
parent a87634a8b53472641e5d4e95d5de66f99cb6bc5c
author Patrick Rohr <prohr@google.com> 1645046565 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1645046565 +0000

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

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

Change-Id: I1974744d7b8993db44733f524811876b78c9007a