Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74b00306 authored by Pablo Gamito's avatar Pablo Gamito Committed by Automerger Merge Worker
Browse files

Merge changes I838fefec,I6e8a3f28 into main am: 5ec5972f am: bfc9789f 

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



Change-Id: I80170db0469ca9c22cb09c62f2dda2116d2b02cc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 62262e6f bfc9789f

core/java/android/tracing/OWNERS

+1 −3
Original line number Diff line number Diff line 
carmenjackson@google.com

kevinjeon@google.com

pablogamito@google.com

natanieljr@google.com

keanmariotti@google.com

include platform/development:/tools/winscope/OWNERS

include platform/external/perfetto:/OWNERS

core/java/com/android/internal/protolog/OWNERS

0 → 100644
+3 −0
Original line number Diff line number Diff line 
# ProtoLog owners

# Bug component: 1157642

include platform/development:/tools/winscope/OWNERS

tools/protologtool/OWNERS

0 → 100644
+3 −0
Original line number Diff line number Diff line 
# ProtoLog owners

# Bug component: 1157642

include platform/development:/tools/winscope/OWNERS