tree 05c6b65db65b972c99df0496f6de3482c14a3b84
parent 66ee007279b59da408e1795c2700a1af330350ee
parent a48b8a3ec8acaade53b40a87bca68dc94848e618
author Yi Kong <yikong@google.com> 1729839339 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1729839339 +0000

Merge "profcollect: Disable tracing while ADB is connected" into main am: 6511b8ab6b am: a48b8a3ec8

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

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