tree 7bb02f7aec11ee946003296bce03a87333a1e5df
parent b9b6310622bc0700296244f0a3d35fc459b5a196
parent f87f4431a2ba7246c8cfa58312587b7bb81abaf6
author Yasuhiro Matsuda <mazda@google.com> 1438249990 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438249990 +0000

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

* commit 'f87f4431a2ba7246c8cfa58312587b7bb81abaf6':
  Enable atrace to read categories from file.