Commit 952e030e authored by Hector's avatar Hector Committed by android-build-merger
Browse files

Merge "Optionally holds a wakelock while collecting perfetto traces on... 

Merge "Optionally holds a wakelock while collecting perfetto traces on onTestRunStart, onTestStart, onTestEnd, onTestRunEnd, depending on which ones are enabled." into qt-dev
am: 8ae97914

Change-Id: I7b525ce5b49b6292d21c26408509f17ff970169c
parents 71e11a6d 8ae97914
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment