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

Skip to content
Commit 376f16b1 authored by Pablo Gamito's avatar Pablo Gamito Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Move ProtoLog tests to seperate test directory... 

[automerger skipped] Merge "Move ProtoLog tests to seperate test directory dedicated to tracing tests" into main am: 300ec631 am: 2c719f45 -s ours

am skip reason: Merged-In I1f53100c03e71647746d2214f1bf23ec30ec3129 with SHA-1 66b87063 is already in history

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



Change-Id: I2a1da870ade41bf6692c26e153809f1c0041329e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 31dd258b 2c719f45
Hide 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