| commit | a3e9df70feaa74c7a49b6a254e38378462097c06 | [log] [tgz] |
|---|---|---|
| author | Yasuhiro Matsuda <mazda@google.com> | Thu Jul 30 09:53:10 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 30 09:53:10 2015 +0000 |
| tree | 7bb02f7aec11ee946003296bce03a87333a1e5df | |
| parent | b9b6310622bc0700296244f0a3d35fc459b5a196 [diff] | |
| parent | f87f4431a2ba7246c8cfa58312587b7bb81abaf6 [diff] |
am f87f4431: am 607b913e: am 366c38f8: Merge "Enable atrace to read categories from file." * commit 'f87f4431a2ba7246c8cfa58312587b7bb81abaf6': Enable atrace to read categories from file.