| commit | d0cbde8e944d2578d7fd74d634a7d173df5c3403 | [log] [tgz] |
|---|---|---|
| author | Yasuhiro Matsuda <mazda@google.com> | Thu Jul 30 08:05:12 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 30 08:05:12 2015 +0000 |
| tree | 9a8f1bd107409cf5fa63a70417479d98ba011c51 | |
| parent | 901367bf66472aa250e48db0492deedd6239f28c [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.