OSDN Git Service

am 366c38f8: Merge "Enable atrace to read categories from file."
authorYasuhiro Matsuda <mazda@google.com>
Thu, 30 Jul 2015 07:51:08 +0000 (07:51 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 30 Jul 2015 07:51:08 +0000 (07:51 +0000)
* commit '366c38f82393c8a3e9419c0dbe6320504a4d741b':
  Enable atrace to read categories from file.


Trivial merge