tree 665b834f82461add0938cbd50ef6f46aacef7558
parent 90a18e65b415d89d89e5898ce7546f6fc67e8a0a
parent 8e6369e64028e5cafcf69ad313781493fe61b61a
author Chris Craik <ccraik@google.com> 1428531540 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428531540 +0000

am 8e6369e6: Merge "Added ability to import traces from multiple tracers."

* commit '8e6369e64028e5cafcf69ad313781493fe61b61a':
  Added ability to import traces from multiple tracers.