| commit | 5c6e7dd8b585186fdab76705b0029e46557ce643 | [log] [tgz] |
|---|---|---|
| author | Chris Craik <ccraik@google.com> | Wed Apr 08 22:19:00 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 08 22:19:00 2015 +0000 |
| tree | 665b834f82461add0938cbd50ef6f46aacef7558 | |
| parent | 90a18e65b415d89d89e5898ce7546f6fc67e8a0a [diff] | |
| parent | 8e6369e64028e5cafcf69ad313781493fe61b61a [diff] |
am 8e6369e6: Merge "Added ability to import traces from multiple tracers." * commit '8e6369e64028e5cafcf69ad313781493fe61b61a': Added ability to import traces from multiple tracers.