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

Skip to content
Commit fff4bb40 authored by Carmen Jackson's avatar Carmen Jackson Committed by android-build-merger
Browse files

[automerger skipped] Merge "Move basic events into the sched category in... 

[automerger skipped] Merge "Move basic events into the sched category in atrace." am: 7aaa2548 am: dd912213 -s ours
am: eb049443 -s ours
am skip reason: change_id Ib6bd958c1b873acfa8b04a79fc2b9b65a529d768 with SHA1 63ea291d is in history

Change-Id: I5634a44518f9c9969632e008e7408e50bc082d03
parents 212a19aa eb049443
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment