tree e161280631ce56cd06d30b53e49883166358347c
parent c3358875169b920847a72428f4e8b8f09f7bdf05
parent b24085d55b082d802eba699243dba26fbc6ac712
author Elliott Hughes <enh@google.com> 1401226155 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401226155 +0000

am b24085d5: Merge "adb: Add USB vendor ID for Unowhy"

* commit 'b24085d55b082d802eba699243dba26fbc6ac712':
  adb: Add USB vendor ID for Unowhy