tree 2ff9ba2b92cbeae2c3d33865b308333755a2049a
parent 2cb9994c022e67c28f0e436035202928a000993c
parent 46c51fb1adf8bc011b7d5b1c98a89303acb8c57b
author Yasuhiro Matsuda <mazda@google.com> 1438242128 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1438242128 +0000

Merge "Enable atrace to read categories from file."