tree 1eb0be62c03556d92b49256f6953d439f27e0a4a
parent d3ade367c1aed18cc002f1443ed902acb43e194f
parent b1b187f7c870a5267ef9d7a4476e281cd6ccffc7
author Colin Cross <ccross@android.com> 1389041810 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1389041810 +0000

am b1b187f7: am 748ab31f: am d8f74f1b: am 491ecd0b: Merge changes Id8bec8a3,Ied42e4d0,Iea3f7cc6,Ic7f7c984,Ic77d5f71, ...

* commit 'b1b187f7c870a5267ef9d7a4476e281cd6ccffc7':
  adb: Add USB vendor ID for YotaDevices
  adb: Add USB vendor ID for TechFaith
  adb: Add USB vendor ID for Rockchip
  adb: Add USB vendor ID for EMERGING Technology (Holdings) Ltd.
  adb: Add USB vendor ID for Allwinner
  adb: Add USB vendor ID for Amlogic
  added Gigaset's USB vendor ID
  adb: alphabetically sort usb vendors lists