Commit f87f4431 authored by Yasuhiro Matsuda's avatar Yasuhiro Matsuda Committed by Android Git Automerger
Browse files

am 607b913e: am 366c38f8: Merge "Enable atrace to read categories from file." 

* commit '607b913e':
  Enable atrace to read categories from file.
parents 36ccc3d9 607b913e
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