tree a8793f43fb0c14d886c203cb94d0239cd5f23e92
parent eaf4ca4c7b6dbd7eb7a5eeb0ce4c9f9027c26698
parent e444680c965cbfb7fba8de594a8e184b6974b3dc
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1580541961 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1580541961 +0000

Merge "Add /sys/kernel/tracing/trace_marker to whitelist" am: e77dc7a00b am: 679c324ba7 am: e444680c96

Change-Id: I3fbd4d1644d8fa170532edefee9833b904175ba5