tree 98ae9c88b6231b9bce49d5eb92d6d7a7f9f1612c
parent 9882179d699abb630851b6a22ce61ec3beb95bcf
parent 8bd443063b4a981a0db0307f4dcfc038e1a7671d
author Chris Craik <ccraik@google.com> 1428455227 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428455227 +0000

am 8bd44306: Merge "Set default tracing categories"

* commit '8bd443063b4a981a0db0307f4dcfc038e1a7671d':
  Set default tracing categories