tree 6a7af5261c166e890bfae9eb30f71723a66fe64b
parent 7eea6200cbb7a90b056cd7c2d0d84815c2fe0458
parent 748ab31ffbe3268249a8ef3dadbf6a79bd8df389
author Colin Cross <ccross@android.com> 1389040147 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1389040147 +0000

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

* commit '748ab31ffbe3268249a8ef3dadbf6a79bd8df389':
  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