tree 9fd0beace432e498e7e8f79e6d77b89513e81a60
parent 049296382d3604868378c957e999ae63cf3a1f5f
parent c4ff03899dd6259299c90e9b9e344ec737cd77e4
author Elliott Hughes <enh@google.com> 1410373243 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410373243 +0000

am c4ff0389: Merge "adb: Add USB vendor ID for Alco Digital Devices Limited"

* commit 'c4ff03899dd6259299c90e9b9e344ec737cd77e4':
  adb: Add USB vendor ID for Alco Digital Devices Limited