| commit | acbe4f5b7fb500d290963b8101f05f6658da6c87 | [log] [tgz] |
|---|---|---|
| author | Yasuhiro Matsuda <mazda@google.com> | Thu Aug 27 05:12:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 05:12:46 2015 +0000 |
| tree | f07b202ea380fb956bc11373d8993a1015b55f60 | |
| parent | 27dd16471a0683a351b94fb213683a1aec301a9f [diff] | |
| parent | d0cbde8e944d2578d7fd74d634a7d173df5c3403 [diff] |
am d0cbde8e: (-s ours) am 607b913e: am 366c38f8: Merge "Enable atrace to read categories from file." * commit 'd0cbde8e944d2578d7fd74d634a7d173df5c3403':