| commit | 607b913e8a911a9acf8ea38c6ab2c60ca2ad702d | [log] [tgz] |
|---|---|---|
| author | Yasuhiro Matsuda <mazda@google.com> | Thu Jul 30 07:51:08 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 30 07:51:08 2015 +0000 |
| tree | 2ff9ba2b92cbeae2c3d33865b308333755a2049a | |
| parent | ed32594d0bdfc2fb675d2e5fb0259d3d22b42aff [diff] | |
| parent | 366c38f82393c8a3e9419c0dbe6320504a4d741b [diff] |
am 366c38f8: Merge "Enable atrace to read categories from file." * commit '366c38f82393c8a3e9419c0dbe6320504a4d741b': Enable atrace to read categories from file.