tree 6f7614efce5a5f456baeb8037b87bd53c3df3c58
parent 5234147c1e5cade7ecf98c12c8a7d7de6cd429ed
parent c1b6b153dc7c535294a63a215a018d0824813757
author Colin Cross <ccross@android.com> 1389039514 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1389039514 +0000

Merge changes Id8bec8a3,Ied42e4d0,Iea3f7cc6,Ic7f7c984,Ic77d5f71, ...

* changes:
  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