tree 5c06f2ba64c0cbb829eac4c01637aae7ac85da64
parent c8d7d2d6b99f405ea3fcada0d2407baee23873f6
parent 491ecd0b7275a98b7fda9b1e807724f7f06b1469
author Colin Cross <ccross@android.com> 1389039810 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1389039810 -0800

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

* commit '491ecd0b7275a98b7fda9b1e807724f7f06b1469':
  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