tree 338e65545e505eaa6727c407ee61e8bc6e8ff0f6
parent e8ee209733e01a460905ed4ccbf7d3648f9b8de0
parent ac81bf51a41dcf44911132ff3ca9edfa4532cc1c
author Dan Albert <danalbert@google.com> 1426828152 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426828152 +0000

am ac81bf51: am 44ec5822: Merge "Use text based trace masks for adbd."

* commit 'ac81bf51a41dcf44911132ff3ca9edfa4532cc1c':
  Use text based trace masks for adbd.