Commit 755b10dd 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

Change-Id: I068e661eba9c7e668a6157dc4d704b4b73e8514c
parents fe614d7b 27ef38ca
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