Commit 4fe84d61 authored by Martijn Coenen's avatar Martijn Coenen Committed by android-build-merger
Browse files

[automerger skipped]Merge "atrace: support new AIDL trace tag." am: 2e8ae431 

am: 82a2cb3c  -s ours

Change-Id: I1881a0ff5eabfccafd875d77e44b5a2b9433bac9
parents 617877c1 82a2cb3c
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