tree 919ff4b6923f75748e1fb543e3ef4ad2b809688d
parent 16785a5bd804c059c08bf49259bb78de4145aa8c
parent 36473768ef6996f2ddf767385a56964e3c88575d
author Dan Albert <danalbert@google.com> 1432250000 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1432250000 +0000

am 36473768: Merge "Clean up adb_trace_init."

* commit '36473768ef6996f2ddf767385a56964e3c88575d':
  Clean up adb_trace_init.