| commit | f87f4431a2ba7246c8cfa58312587b7bb81abaf6 | [log] [tgz] |
|---|---|---|
| author | Yasuhiro Matsuda <mazda@google.com> | Thu Jul 30 08:05:43 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 30 08:05:43 2015 +0000 |
| tree | 7aab0b110c41b028e03279136e3a4bccc54c6290 | |
| parent | 36ccc3d9fd53a36828638c56b3ae45f8548d7afc [diff] | |
| parent | 607b913e8a911a9acf8ea38c6ab2c60ca2ad702d [diff] |
am 607b913e: am 366c38f8: Merge "Enable atrace to read categories from file." * commit '607b913e8a911a9acf8ea38c6ab2c60ca2ad702d': Enable atrace to read categories from file.