tree 4c8d0016bee752ddd601a9208aa7d3d47214ece0
parent 431055cc9bc2cab128f35cf4a4e776994e1ec38d
parent 3fd82b8861aa410fab7785074941b459d92220c1
author Dima Zavin <dima@android.com> 1241985400 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1241985400 -0700

am 3fd82b8: adb: osx: Match devices based on interface subclass and prot

Merge commit '3fd82b8861aa410fab7785074941b459d92220c1'

* commit '3fd82b8861aa410fab7785074941b459d92220c1':
  adb: osx: Match devices based on interface subclass and protocol