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

Skip to content
Commit 5d66d97b authored by Zimuzo Ezeozue's avatar Zimuzo Ezeozue Committed by Automerger Merge Worker
Browse files

Merge "Fix ATRACE_TAG redefinition in SysTrace.h" am: 5b999ecd am:... 

Merge "Fix ATRACE_TAG redefinition in SysTrace.h" am: 5b999ecd am: 9aa4f149 am: bda05a0a am: 0d25702a

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



Change-Id: I578e0a3c1a9a4533d393d74ad8afbfa8396ba568
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ec6d88ba 0d25702a
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment