Commit a0c72620 authored by Hector Dearman's avatar Hector Dearman Committed by android-build-merger
Browse files

Merge "Atrace: Add commandline flags to enable/disable userland tracing" into... 

Merge "Atrace: Add commandline flags to enable/disable userland tracing" into pi-dev am: a46412ea  -s ours
am: 418d963e  -s ours

Change-Id: I92296122500ff6c523a6dbae538c71981b032fae
parents 0f93281b 418d963e
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