Commit 61167ba6 authored by Carmen Jackson's avatar Carmen Jackson Committed by android-build-merger
Browse files

Merge "Do not set the trace clock in atrace.rc." into oc-dev am: 27ef38ca 

am: 755b10dd

Change-Id: If7306d6a2bd35a392aee6e2a6951781bead7cb78
parents 5a8cb035 755b10dd
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