tree ba5ad45d82ee95ba2cb7465b3d730ad6c9893f3d
parent 60fea4b06d633307cf02c53d336c68755215f4d6
parent 7d9ae5a36216989487a68366c6871eb15f705f23
author Junyu Lai <junyulai@google.com> 1643131380 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1643131380 +0000

Merge "Mark NetworkStatsServiceDumpProto userdebug_and_eng_only" am: 0843c02abc am: 5a46037e6a am: 7d9ae5a362

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

Change-Id: I6a0751cf97f1ea5f46695c5748f9bf3965bfac56