tree e7a17098999cb8c64c9f8521b2a63be41afeed9b
parent eb96ff87c028097a3dc66fc167530fe722492545
parent b12ed26783088d7ca2cdd546ffb11bc2236941c9
author Xiaolu Zeng <xiaoluze@google.com> 1699324033 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1699324033 +0000

Merge "Modify StatsPullAtomService: Log network type in WW tagged traffic data." into main am: 731829eccf am: a97d6ff51f am: b12ed26783

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2776647

Change-Id: I9236b63c89ad30e2bb30faa9497c68ebfe23864a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>