Skip to content
Commit e444680c authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Add /sys/kernel/tracing/trace_marker to whitelist" am: e77dc7a0 am: 679c324b 

Change-Id: I0a288a291e9a986b0029755c29568a370aa877fc
parents 06f95ff0 679c324b
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